fix: clean up native notification data on wallet deletion and reset

app/_layout.tsx

@@ -23,8 +23,10 @@ import "~/global.css";
 import { SessionProvider } from "~/hooks/useSession";
 import { IS_EXPO_GO, THEME_COLORS } from "~/lib/constants";
 import { isBiometricSupported } from "~/lib/isBiometricSupported";
+import { sweepOrphanedWalletInfo } from "~/lib/notificationsNativeStorage";
 import { useAppStore } from "~/lib/state/appStore";
 import { useColorScheme } from "~/lib/useColorScheme";
+import { getPubkeyFromNWCUrl } from "~/lib/utils";
 import { registerForPushNotificationsAsync } from "~/services/Notifications";
 
 Sentry.init({
@@ -78,6 +80,18 @@ export default Sentry.wrap(function RootLayout() {
     }
   }
 
+  // Removes any stored notification data for wallets that no longer exist
+  // in the app (e.g. left behind by a previous app version).
+  async function sweepOrphanedNotificationData() {
+    const activePublicKeys = useAppStore
+      .getState()
+      .wallets.map((wallet) =>
+        getPubkeyFromNWCUrl(wallet.nostrWalletConnectUrl ?? ""),
+      )
+      .filter((publicKey): publicKey is string => !!publicKey);
+    await sweepOrphanedWalletInfo(activePublicKeys);
+  }
+
   const loadTheme = React.useCallback((): Promise<void> => {
     return new Promise((resolve) => {
       const theme = useAppStore.getState().theme;
@@ -98,6 +112,7 @@ export default Sentry.wrap(function RootLayout() {
         setResourcesLoaded(true);
         if (!IS_EXPO_GO) {
           await checkAndPromptForNotifications();
+          await sweepOrphanedNotificationData();
         }
         SplashScreen.hide();
       }

lib/notifications.ts

@@ -65,7 +65,7 @@ export async function registerWalletNotifications(
         walletId,
       );
     } else {
-      new Error(`Error: ${response.status} ${response.statusText}`);
+      throw new Error(`Error: ${response.status} ${response.statusText}`);
     }
 
     const walletData: WalletInfo = {

lib/notificationsNativeStorage.ts

@@ -1,6 +1,6 @@
 import { Platform } from "react-native";
 import { IS_EXPO_GO, SUITE_NAME } from "~/lib/constants";
-import { BitcoinDisplayFormat } from "~/lib/state/appStore";
+import type { BitcoinDisplayFormat } from "~/lib/state/appStore";
 
 // this is done because accessing values stored from expo-secure-store
 // is quite difficult and we do not wish to complicate the notification
@@ -132,3 +132,49 @@ function removeWallet(wallets: Wallets, publicKey: string): Wallets {
   }
   return wallets;
 }
+
+// Removes any stored wallet notification data whose public key does not
+// belong to a currently-configured wallet. This catches entries left behind
+// by earlier app versions or edge cases (e.g. a crash between removing a
+// wallet and its notification data being cleared).
+export async function sweepOrphanedWalletInfo(activePublicKeys: string[]) {
+  if (IS_EXPO_GO) {
+    return;
+  }
+  const activeSet = new Set(activePublicKeys);
+  if (Platform.OS === "ios") {
+    const UserDefaults = await getUserDefaultsModule();
+    const groupDefaults = new UserDefaults(SUITE_NAME);
+    const wallets: Wallets | undefined = await groupDefaults.get("wallets");
+    if (!wallets) {
+      return;
+    }
+    const orphanedPublicKeys = Object.keys(wallets).filter(
+      (publicKey) => !activeSet.has(publicKey),
+    );
+    if (!orphanedPublicKeys.length) {
+      return;
+    }
+    for (const publicKey of orphanedPublicKeys) {
+      delete wallets[publicKey];
+    }
+    await groupDefaults.set("wallets", wallets);
+  } else {
+    const SharedPreferences = await getSharedPreferencesModule();
+    const walletsString = await SharedPreferences.getItemAsync("wallets");
+    if (!walletsString) {
+      return;
+    }
+    const wallets: Wallets = JSON.parse(walletsString);
+    const orphanedPublicKeys = Object.keys(wallets).filter(
+      (publicKey) => !activeSet.has(publicKey),
+    );
+    if (!orphanedPublicKeys.length) {
+      return;
+    }
+    for (const publicKey of orphanedPublicKeys) {
+      delete wallets[publicKey];
+    }
+    await SharedPreferences.setItemAsync("wallets", JSON.stringify(wallets));
+  }
+}

lib/state/appStore.ts

@@ -2,6 +2,7 @@ import { NWCClient, type Nip47Capability } from "@getalby/sdk/nwc";
 import { hexToBytes } from "@noble/hashes/utils.js";
 import { getPublicKey } from "nostr-tools";
 import { create } from "zustand";
+import { removeAllInfo } from "~/lib/notificationsNativeStorage";
 import { secureStorage } from "../secureStorage";
 
 interface AppState {
@@ -40,7 +41,7 @@ interface AppState {
   addWallet(wallet: Wallet): void;
   addAddressBookEntry(entry: AddressBookEntry): void;
   removeAddressBookEntry: (index: number) => void;
-  reset(): void;
+  reset(): Promise<void>;
   getLastAlbyPayment(): Date | null;
   updateLastAlbyPayment(): void;
 }
@@ -353,7 +354,9 @@ export const useAppStore = create<AppState>()((set, get) => {
       set({
         lastAppStateChangeTime,
       }),
-    reset() {
+    async reset() {
+      await removeAllInfo();
+
       // clear wallets
       for (let i = 0; i < get().wallets.length; i++) {
         secureStorage.removeItem(getWalletKey(i));

pages/settings/Settings.tsx

@@ -29,7 +29,6 @@ import { Text } from "~/components/ui/text";
 import { useSession } from "~/hooks/useSession";
 import { IS_EXPO_GO } from "~/lib/constants";
 import { deregisterWalletNotifications } from "~/lib/notifications";
-import { removeAllInfo } from "~/lib/notificationsNativeStorage";
 import { useAppStore } from "~/lib/state/appStore";
 import { useColorScheme } from "~/lib/useColorScheme";
 import { cn } from "~/lib/utils";
@@ -281,15 +280,18 @@ export function Settings() {
                             onPress: async () => {
                               if (!IS_EXPO_GO) {
                                 for (const [id, wallet] of wallets.entries()) {
+                                  // clears each wallet's remote push
+                                  // subscription and local notification data;
+                                  // reset() below also clears any remaining
+                                  // native notification data
                                   await deregisterWalletNotifications(
                                     wallet,
                                     id,
                                   );
                                 }
-                                await removeAllInfo();
                               }
                               router.dismissAll();
-                              useAppStore.getState().reset();
+                              await useAppStore.getState().reset();
                             },
                           },
                         ],

pages/settings/wallets/EditWallet.tsx

@@ -32,16 +32,13 @@ export function EditWallet() {
   const { id } = useLocalSearchParams() as { id: string };
   const wallets = useAppStore((store) => store.wallets);
   const [isDeleting, setIsDeleting] = useState(false);
-  const isNotificationsEnabled = useAppStore(
-    (store) => store.isNotificationsEnabled,
-  );
   const [showConnectionInfo, setShowConnectionInfo] = React.useState(false);
 
   let walletId = parseInt(id);
 
   const onDeleteWallet = async () => {
     setIsDeleting(true);
-    if (!IS_EXPO_GO && isNotificationsEnabled) {
+    if (!IS_EXPO_GO) {
       const wallet = wallets[walletId];
       await deregisterWalletNotifications(wallet, walletId);
     }