Fix default account selection. Specific backup (#4159)

* fix default account selection * restore second backup * Fix crash * Fix potential crash Co-authored-by: Bruno Barbieri <[email protected]> Co-authored-by: Terry Sahaidak <[email protected]>
rainbow-me · Sep 13, 2022 · 0b372e8 · 0b372e8
1 parent d74c7ba
commit 0b372e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/settings-menu/BackupSection/AlreadyBackedUpView.tsx b/src/components/settings-menu/BackupSection/AlreadyBackedUpView.tsx
@@ -69,7 +69,7 @@ export default function AlreadyBackedUpView() {
 
   const walletStatus = useMemo(() => {
     let status = null;
-    if (wallets?.[walletId].backedUp) {
+    if (wallets?.[walletId]?.backedUp) {
       if (wallets?.[walletId].backupType === WalletBackupTypes.manual) {
         status = WalletBackupStatus.MANUAL_BACKUP;
       } else {
@@ -133,7 +133,7 @@ export default function AlreadyBackedUpView() {
 
   const { colors, isDarkMode } = useTheme();
 
-  const isSecretPhrase = WalletTypes.mnemonic === wallets?.[walletId].type;
+  const isSecretPhrase = WalletTypes.mnemonic === wallets?.[walletId]?.type;
 
   const handleViewRecoveryPhrase = useCallback(() => {
     navigate('ShowSecretView', {

diff --git a/src/handlers/cloudBackup.ts b/src/handlers/cloudBackup.ts
@@ -153,7 +153,10 @@ export async function getDataFromCloud(backupPassword: any, filename = null) {
       );
     } else {
       document = backups.files.find((file: any) => {
-        return file.name === `${REMOTE_BACKUP_WALLET_DIR}/${filename}`;
+        return (
+          file.name === `${REMOTE_BACKUP_WALLET_DIR}/${filename}` ||
+          file.name === filename
+        );
       });
     }