Use /job/status to update backup status correctly

Author: seshanthS

app/src/components/NavBar/Points.tsx

@@ -75,18 +75,35 @@ const Points: React.FC = () => {
     }, []),
   );
 
-  //TODO - uncomment after merging - https://github.com/selfxyz/self/pull/1363/
-  // useEffect(() => {
-  //   const backupEvent = usePointEventStore
-  //     .getState()
-  //     .events.find(
-  //       event => event.type === 'backup' && event.status === 'completed',
-  //     );
+  const getBackupState = usePointEventStore(state => {
+    const backups = state.events.filter(e => e.type === 'backup');
+    console.log('backups', backups);
+    const isPending = backups.some(e => e.status === 'pending');
+    const isCompleted = backups.some(e => e.status === 'completed');
+    return {
+      pending: isPending,
+      completed: isCompleted,
+      started: isPending || isCompleted,
+    };
+  });
 
-  //   if (backupEvent && !hasCompletedBackupForPoints) {
-  //     setBackupForPointsCompleted();
-  //   }
-  // }, [setBackupForPointsCompleted, hasCompletedBackupForPoints]);
+  //we show the backup success message immediately. This flips the flag to false undo the action
+  //and to show the backup button again.
+  //Another way is to show success modal here, but this ccan be delayed (as polling can be upto 32 seconds)
+  useEffect(() => {
+    if (
+      !getBackupState.pending &&
+      !getBackupState.completed &&
+      hasCompletedBackupForPoints
+    ) {
+      setBackupForPointsCompleted(false);
+    }
+  }, [
+    getBackupState.completed,
+    getBackupState.pending,
+    hasCompletedBackupForPoints,
+    setBackupForPointsCompleted,
+  ]);
 
   // Track if we should check for backup completion on next focus
   const shouldCheckBackupRef = React.useRef(false);

app/src/screens/account/settings/CloudBackupScreen.tsx

@@ -129,7 +129,9 @@ const CloudBackupScreen: React.FC<CloudBackupScreenProps> = ({
       trackEvent(BackupEvents.CLOUD_BACKUP_ENABLED_DONE);
 
       if (params?.returnToScreen) {
-        navigation.navigate(params.returnToScreen);
+        setTimeout(() => {
+          navigation.navigate(params.returnToScreen);
+        }, 500);
       }
     } catch (error) {
       console.error('iCloud backup error', error);
@@ -176,7 +178,9 @@ const CloudBackupScreen: React.FC<CloudBackupScreenProps> = ({
       setTurnkeyPending(false);
 
       if (params?.returnToScreen) {
-        navigation.navigate(params.returnToScreen);
+        setTimeout(() => {
+          navigation.navigate(params.returnToScreen);
+        }, 500);
       }
     } catch (error) {
       if (error instanceof Error && error.message === 'already_exists') {
@@ -188,7 +192,9 @@ const CloudBackupScreen: React.FC<CloudBackupScreenProps> = ({
       ) {
         console.log('Already backed up with Turnkey');
         if (params?.returnToScreen) {
-          navigation.navigate(params.returnToScreen);
+          setTimeout(() => {
+            navigation.navigate(params.returnToScreen);
+          }, 500);
         } else if (params?.nextScreen) {
           navigation.navigate(params.nextScreen);
         } else {

app/src/stores/settingStore.ts

@@ -107,8 +107,8 @@ export const useSettingStore = create<SettingsState>()(
       setTurnkeyBackupEnabled: (turnkeyBackupEnabled: boolean) =>
         set({ turnkeyBackupEnabled }),
       hasCompletedBackupForPoints: false,
-      setBackupForPointsCompleted: () =>
-        set({ hasCompletedBackupForPoints: true }),
+      setBackupForPointsCompleted: (value: boolean = true) =>
+        set({ hasCompletedBackupForPoints: value }),
       resetBackupForPoints: () => set({ hasCompletedBackupForPoints: false }),
       pointsAddress: null,
       setPointsAddress: (address: string | null) =>

app/src/utils/points/jobStatus.ts

@@ -33,10 +33,13 @@ export async function checkEventProcessingStatus(
     // 200 means completed or failed - check the response body
     if (response.status === 200) {
       const data: JobStatusResponse = await response.json();
-      if (data.status === 'complete') {
+      if (data.success === true) {
         return 'completed';
       }
-      if (data.status === 'failed') {
+      if (data.success === false) {
+        if (data.message && data.message === 'Address already verified') {
+          return 'completed';
+        }
         return 'failed';
       }
     }