Points: notifications toggle (#5329)

src/components/sheet/sheet-action-buttons/SwapActionButton.js

@@ -41,7 +41,6 @@ function SwapActionButton({
           screen: Routes.MAIN_EXCHANGE_SCREEN,
         };
       } else {
-        console.log(asset);
         return {
           params: {
             defaultInputAsset: asset,

src/config/experimental.ts

@@ -22,6 +22,7 @@ export const MINTS = 'Mints';
 export const POINTS = 'Points';
 export const REMOTE_PROMO_SHEETS = 'RemotePromoSheets';
 export const REMOTE_CARDS = 'RemoteCards';
+export const POINTS_NOTIFICATIONS_TOGGLE = 'PointsNotificationsToggle';
 
 /**
  * A developer setting that pushes log lines to an array in-memory so that
@@ -53,6 +54,7 @@ export const defaultConfig: Record<string, ExperimentalValue> = {
   [POINTS]: { settings: true, value: false },
   [REMOTE_PROMO_SHEETS]: { settings: true, value: false },
   [REMOTE_CARDS]: { settings: true, value: false },
+  [POINTS_NOTIFICATIONS_TOGGLE]: { settings: true, value: false },
 };
 
 const storageKey = 'config';

src/languages/en_US.json

@@ -1253,6 +1253,10 @@
         "get_started": "Get Started",
         "invalid_code": "Invalid Code"
       },
+      "notifications": {
+        "enable": "Enable Points Notifications",
+        "disable": "Disable Points Notifications"
+      },
       "points": {
         "referral_code": "Referral Code",
         "share_link": "Share Link",
@@ -1711,6 +1715,7 @@
       "notifications": "Notifications",
       "notifications_section": {
         "my_wallets": "My Wallets",
+        "points": "Points",
         "watched_wallets": "Watched Wallets",
         "allow_notifications": "Allow Notifications",
         "sent": "Sent",

src/migrations/migrations/migrateNotificationSettingsToV2.ts

@@ -1,14 +1,14 @@
 import { Migration, MigrationName } from '@/migrations/types';
 import {
-  getAllNotificationSettingsFromStorage,
-  setAllNotificationSettingsToStorage,
+  getAllWalletNotificationSettingsFromStorage,
+  setAllWalletNotificationSettingsToStorage,
 } from '@/notifications/settings/storage';
 
 export function migrateNotificationSettingsToV2(): Migration {
   return {
     name: MigrationName.migrateNotificationSettingsToVersion2,
     async migrate() {
-      const walletSettings = getAllNotificationSettingsFromStorage();
+      const walletSettings = getAllWalletNotificationSettingsFromStorage();
       let settingsVersion = 1;
 
       if (
@@ -27,7 +27,7 @@ export function migrateNotificationSettingsToV2(): Migration {
           ...wallet,
           successfullyFinishedInitialSubscription: true,
         }));
-        setAllNotificationSettingsToStorage(newSettings);
+        setAllWalletNotificationSettingsToStorage(newSettings);
       }
       return;
     },

src/model/remoteConfig.ts

@@ -73,6 +73,7 @@ interface RainbowConfig extends Record<string, string | boolean | number> {
   rpc_proxy_enabled: boolean;
   remote_cards_enabled: boolean;
   remote_promo_enabled: boolean;
+  points_notifications_toggle: boolean;
 }
 
 const DEFAULT_CONFIG: RainbowConfig = {
@@ -137,6 +138,7 @@ const DEFAULT_CONFIG: RainbowConfig = {
   rpc_proxy_enabled: true,
   remote_cards_enabled: false,
   remote_promo_enabled: false,
+  points_notifications_toggle: true,
 };
 
 export async function fetchRemoteConfig(): Promise<RainbowConfig> {
@@ -179,7 +181,8 @@ export async function fetchRemoteConfig(): Promise<RainbowConfig> {
         key === 'points_fully_enabled' ||
         key === 'rpc_proxy_enabled' ||
         key === 'remote_promo_enabled' ||
-        key === 'remote_cards_enabled'
+        key === 'remote_cards_enabled' ||
+        key === 'points_notifications_toggle'
       ) {
         config[key] = entry.asBoolean();
       } else {

src/model/wallet.ts

@@ -66,7 +66,7 @@ import {
 import {
   AddressWithRelationship,
   initializeNotificationSettingsForAddresses,
-  NotificationRelationship,
+  WalletNotificationRelationship,
 } from '@/notifications/settings';
 import { DebugContext } from '@/logger/debugContext';
 import { IS_ANDROID } from '@/env';
@@ -980,8 +980,8 @@ export const createWallet = async ({
     // create notifications settings entry for newly created wallet
     const relationship =
       type === EthereumWalletType.readOnly
-        ? NotificationRelationship.WATCHER
-        : NotificationRelationship.OWNER;
+        ? WalletNotificationRelationship.WATCHER
+        : WalletNotificationRelationship.OWNER;
     const addressesWithRelationship: AddressWithRelationship[] = addresses.map(
       account => ({
         relationship,
@@ -1345,7 +1345,7 @@ export const generateAccount = async (
       {
         address: walletAddress,
         // Wallet or account created from within the app is attached to a seed phrase so it's an owned wallet
-        relationship: NotificationRelationship.OWNER,
+        relationship: WalletNotificationRelationship.OWNER,
       },
     ]);
 

src/notifications/NotificationsHandler.tsx

@@ -52,9 +52,12 @@ import {
 } from '@/notifications/analytics';
 import {
   AddressWithRelationship,
-  NotificationRelationship,
+  WalletNotificationRelationship,
 } from '@/notifications/settings';
-import { initializeNotificationSettingsForAllAddressesAndCleanupSettingsForRemovedWallets } from '@/notifications/settings/initialization';
+import {
+  initializeGlobalNotificationSettings,
+  initializeNotificationSettingsForAllAddressesAndCleanupSettingsForRemovedWallets,
+} from '@/notifications/settings/initialization';
 import { logger } from '@/logger';
 import { setHasPendingDeeplinkPendingRedirect } from '@/walletConnect';
 
@@ -381,15 +384,16 @@ export const NotificationsHandler = ({ walletReady }: Props) => {
               address,
               relationship:
                 wallet.type === walletTypes.readOnly
-                  ? NotificationRelationship.WATCHER
-                  : NotificationRelationship.OWNER,
+                  ? WalletNotificationRelationship.WATCHER
+                  : WalletNotificationRelationship.OWNER,
             })
         )
       );
-
+      initializeGlobalNotificationSettings();
       initializeNotificationSettingsForAllAddressesAndCleanupSettingsForRemovedWallets(
         addresses
       );
+
       alreadyRanInitialization.current = true;
     }
   }, [dispatch, walletReady]);

src/notifications/analytics.ts

@@ -3,12 +3,12 @@ import { MinimalNotification } from '@/notifications/types';
 import { getPermissionStatus } from '@/notifications/permissions';
 import messaging from '@react-native-firebase/messaging';
 import {
-  NotificationRelationship,
+  WalletNotificationRelationship,
   WALLET_GROUPS_STORAGE_KEY,
   WALLET_TOPICS_STORAGE_KEY,
   GroupSettings,
-  NotificationRelationshipType,
-  NotificationTopicType,
+  WalletNotificationRelationshipType,
+  WalletNotificationTopicType,
   WalletNotificationSettings,
   notificationSettingsStorage,
 } from '@/notifications/settings';
@@ -25,10 +25,10 @@ export const trackTappedPushNotification = (
 };
 
 export const trackChangedNotificationSettings = (
-  chainId: number,
-  topic: NotificationTopicType,
-  type: NotificationRelationshipType,
-  action: 'subscribe' | 'unsubscribe'
+  topic: WalletNotificationTopicType,
+  action: 'subscribe' | 'unsubscribe',
+  chainId?: number,
+  type?: WalletNotificationRelationshipType
 ) => {
   analytics.track('Changed Notification Settings', {
     chainId,
@@ -80,8 +80,8 @@ export const trackWalletsSubscribedForNotifications = () => {
   const { imported, watched } = countWalletsWithNotificationsTurnedOn(wallets);
 
   trackNumberOfWalletsWithNotificationsTurnedOn(
-    groups[NotificationRelationship.OWNER] ? imported : 0,
-    groups[NotificationRelationship.WATCHER] ? watched : 0
+    groups[WalletNotificationRelationship.OWNER] ? imported : 0,
+    groups[WalletNotificationRelationship.WATCHER] ? watched : 0
   );
 };
 
@@ -118,8 +118,8 @@ const onGroupStateChange = (state: GroupSettings) => {
   const { imported, watched } = countWalletsWithNotificationsTurnedOn(wallets);
 
   trackNumberOfWalletsWithNotificationsTurnedOn(
-    state[NotificationRelationship.OWNER] ? imported : 0,
-    state[NotificationRelationship.WATCHER] ? watched : 0
+    state[WalletNotificationRelationship.OWNER] ? imported : 0,
+    state[WalletNotificationRelationship.WATCHER] ? watched : 0
   );
 };
 
@@ -137,7 +137,7 @@ const countWalletsWithNotificationsTurnedOn = (
 
   wallets.forEach(entry => {
     if (!entry.enabled) return;
-    if (entry.type === NotificationRelationship.OWNER) imported += 1;
+    if (entry.type === WalletNotificationRelationship.OWNER) imported += 1;
     else watched += 1;
   });