Merge pull request #825 from alephium/add-catch

Add try/catch

apps/mobile-wallet/locales/en-US/translation.json

@@ -172,6 +172,7 @@
   "Created fund password": "Created fund password",
   "Delete fund password": "Delete fund password",
   "Fund password was deleted.": "Fund password was deleted.",
+  "Could not save fund password.": "Could not save fund password.",
   "You can set a new password below. This password will be required for critical operations involving the safety of your funds and cannot be recovered.": "You can set a new password below. This password will be required for critical operations involving the safety of your funds and cannot be recovered.",
   "The fund password acts as an additional authentication layer for critical operations involving the safety of your funds such as revealing your secret recovery phrase or sending funds.": "The fund password acts as an additional authentication layer for critical operations involving the safety of your funds such as revealing your secret recovery phrase or sending funds.",
   "Edit password": "Edit password",

apps/mobile-wallet/src/features/fund-password/FundPasswordScreen.tsx

@@ -40,7 +40,7 @@ import useFundPasswordGuard from '~/features/fund-password/useFundPasswordGuard'
 import { useAppDispatch } from '~/hooks/redux'
 import usePassword from '~/hooks/usePassword'
 import RootStackParamList from '~/navigation/rootStackRoutes'
-import { showToast } from '~/utils/layout'
+import { showExceptionToast, showToast } from '~/utils/layout'
 import { resetNavigation } from '~/utils/navigation'
 
 interface FundPasswordScreenProps
@@ -80,20 +80,24 @@ const FundPasswordScreen = ({ navigation, ...props }: FundPasswordScreenProps) =
   }, [currentFundPassword])
 
   const handleSavePress = async () => {
-    await storeFundPassword(newPassword || password)
-    dispatch(fundPasswordUseToggled(true))
-    showToast({
-      text1: t('Saved!'),
-      text2: newPassword ? t('Fund password was updated.') : t('Fund password was set up.'),
-      type: 'success'
-    })
-    cameFromBackupScreen ? resetNavigation(navigation) : navigation.goBack()
-    sendAnalytics({
-      event: newPassword ? t('Updated fund password') : t('Created fund password'),
-      props: {
-        origin: props.route.params.origin
-      }
-    })
+    try {
+      await storeFundPassword(newPassword || password)
+      dispatch(fundPasswordUseToggled(true))
+      showToast({
+        text1: t('Saved!'),
+        text2: newPassword ? t('Fund password was updated.') : t('Fund password was set up.'),
+        type: 'success'
+      })
+      cameFromBackupScreen ? resetNavigation(navigation) : navigation.goBack()
+      sendAnalytics({
+        event: newPassword ? t('Updated fund password') : t('Created fund password'),
+        props: {
+          origin: props.route.params.origin
+        }
+      })
+    } catch (error) {
+      showExceptionToast(error, t('Could not save fund password.'))
+    }
   }
 
   const handlePasswordEdit = () => {

apps/mobile-wallet/src/persistent-storage/wallet.ts

@@ -101,6 +101,8 @@ export const validateAndRepareStoredWalletData = async (
             onPress: async () => {
               try {
                 await generateAndStoreWalletMetadata('My wallet', false)
+              } catch (error) {
+                console.error(error)
               } finally {
                 walletMetadata = await getWalletMetadata(false)
               }