Remove use of oldType in notification settings

rainbow-me · Sep 22, 2024 · 601ce5f · 601ce5f
1 parent 8cb3352
commit 601ce5f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/src/notifications/settings/__tests__/initialization.test.txt b/src/notifications/settings/__tests__/initialization.test.txt
@@ -360,10 +360,9 @@ describe('Notification settings initialization', () => {
         initState
       );
 
-      // changed the current type to "owned" and old to "watched" (previous state), also wallet now is not initialized since it needs to re-subscribe
+      // changed the current type to "owned", also wallet now is not initialized since it needs to re-subscribe
       const changedState = {
         type: WalletNotificationRelationship.OWNER,
-        oldType: WalletNotificationRelationship.WATCHER,
         successfullyFinishedInitialSubscription: false,
       };
 
@@ -461,8 +460,6 @@ describe('Notification settings initialization', () => {
       const stateBefore = {
         address: TEST_ADDRESS_1,
         type: WalletNotificationRelationship.OWNER,
-        // has old type as "watcher" which signifies that it was previously watched
-        oldType: WalletNotificationRelationship.WATCHER,
         successfullyFinishedInitialSubscription: false,
         topics: DEFAULT_ENABLED_TOPIC_SETTINGS,
         enabled: false,
@@ -477,7 +474,6 @@ describe('Notification settings initialization', () => {
         ...stateBefore,
         successfullyFinishedInitialSubscription: true,
         enabled: true,
-        oldType: undefined,
       };
       expect(
         JSON.parse(
@@ -532,7 +528,6 @@ describe('Notification settings initialization', () => {
         {
           address: TEST_ADDRESS_2,
           type: WalletNotificationRelationship.OWNER,
-          oldType: WalletNotificationRelationship.WATCHER,
           successfullyFinishedInitialSubscription: false,
           topics: DEFAULT_ENABLED_TOPIC_SETTINGS,
           enabled: false,

diff --git a/src/notifications/settings/initialization.ts b/src/notifications/settings/initialization.ts
@@ -66,13 +66,9 @@ export const initializeNotificationSettingsForAllAddressesAndCleanupSettingsForR
     }
   });
 
-  const proposedSettingsWithRemovedWallets = proposedSettings.filter(
-    setting => {
-      return !removedWalletsThatWereNotUnsubscribedProperly.get(
-        setting.address
-      );
-    }
-  );
+  const proposedSettingsWithRemovedWallets = proposedSettings.filter(setting => {
+    return !removedWalletsThatWereNotUnsubscribedProperly.get(setting.address);
+  });
 
   InteractionManager.runAfterInteractions(() => {
     publishAndSaveWalletSettings(proposedSettingsWithRemovedWallets, true);
@@ -114,7 +110,6 @@ export const _prepareSubscriptionQueueAndCreateInitialSettings = (
         topics: DEFAULT_ENABLED_TOPIC_SETTINGS,
         type: entry.relationship,
         successfullyFinishedInitialSubscription: false,
-        oldType: alreadySavedEntry.settings.type,
       };
       newSettings[alreadySavedEntry.index] = updatedSettingsEntry;
     }

diff --git a/src/notifications/settings/types.ts b/src/notifications/settings/types.ts
@@ -32,8 +32,6 @@ export type WalletNotificationSettings = {
   enabled: boolean;
   type: WalletNotificationRelationshipType;
   successfullyFinishedInitialSubscription: boolean;
-  // only set in cases when the user imported an already watched wallet
-  oldType?: WalletNotificationRelationshipType;
 };
 
 export type GroupSettings = {