Register push token on changing notification settings

minibits-cash · May 30, 2024 · f90033d · f90033d
1 parent 35ebb00
commit f90033d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -78,8 +78,8 @@ function App(props: AppProps) {
         log.debug('[useInitialRootStore]', {deviceToken})
 
         // Save new or refreshed token to local and server profile        
-        if (deviceToken.length > 0 && deviceToken !== walletProfileStore.device) {
-            walletProfileStore.setDevice(deviceToken)
+        if (deviceToken.length > 0) {
+            await walletProfileStore.setDevice(deviceToken)
         }
 
         // Set initial websocket to close as it might have remained open on last app close

diff --git a/src/models/WalletProfileStore.ts b/src/models/WalletProfileStore.ts
@@ -257,8 +257,12 @@ export const WalletProfileStoreModel = types
             return self         
         }),
         setDevice: flow(function* setDevice(device: string) {  
-            self.device = device
-            yield MinibitsClient.updateDeviceToken(self.pubkey, {deviceToken: device})           
+            try {
+                yield MinibitsClient.updateDeviceToken(self.pubkey, {deviceToken: device}) 
+                self.device = device          
+            } catch (e: any) {
+                log.error('[setDevice]', e.message)
+            }
         }),
         setNip05(nip05: string) {   // used in migration to v3 model         
             self.nip05 = nip05             

diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
@@ -89,7 +89,7 @@ export const SettingsScreen: FC<SettingsScreenProps> = observer(
                 log.debug('[SettingsScreen.useEffect]', {deviceToken})
 
                 // Save new or refreshed token to local and server profile        
-                if (deviceToken.length > 0 && deviceToken !== walletProfileStore.device) {
+                if (deviceToken.length) {
                     walletProfileStore.setDevice(deviceToken)
                 }
               } catch (e: any) {