cleaning up SelectedAccountActions + add default loading case

src/actions/SelectedAccountActions.js

@@ -63,91 +63,101 @@ const getAccountLoader = (state: State, selectedAccount: SelectedAccountState):
         };
     }
 
+
+    if (account) return null;
     // account not found (yet). checking why...
-    if (!account) {
+
-        if (!discovery || (discovery.waitingForDevice || discovery.interrupted)) {
+    if (!discovery || (discovery.waitingForDevice || discovery.interrupted)) {
-            if (device.connected) {
+        if (device.connected) {
-                // case 1: device is connected but discovery not started yet (probably waiting for auth)
+            // case 1: device is connected but discovery not started yet (probably waiting for auth)
-                if (device.available) {
+            if (device.available) {
-                    return {
-                        type: 'progress',
-                        title: 'Authenticating device...',
-                        shouldRender: false,
-                    };
-                }
-                // case 2: device is unavailable (created with different passphrase settings) account cannot be accessed
                 return {
-                    type: 'info',
+                    type: 'progress',
-                    title: `Device ${device.instanceLabel} is unavailable`,
+                    title: 'Authenticating device...',
-                    message: 'Change passphrase settings to use this device',
                     shouldRender: false,
                 };
             }
-
+            // case 2: device is unavailable (created with different passphrase settings) account cannot be accessed
-            // case 3: device is disconnected
+            // this is related to device instance in url, it's not used for now (device clones are disabled)
             return {
                 type: 'info',
-                title: `Device ${device.instanceLabel} is disconnected`,
+                title: `Device ${device.instanceLabel} is unavailable`,
-                message: 'Connect device to load accounts',
+                message: 'Change passphrase settings to use this device',
                 shouldRender: false,
             };
         }
 
-        if (discovery.completed) {
+        // case 3: device is disconnected
-            // case 4: account not found and discovery is completed
+        return {
-            return {
+            type: 'info',
-                type: 'info',
+            title: `Device ${device.instanceLabel} is disconnected`,
-                title: 'Account does not exist',
+            message: 'Connect device to load accounts',
-                shouldRender: false,
+            shouldRender: false,
-            };
+        };
-        }
     }
 
-    return null;
+    if (discovery.completed) {
+        // case 4: account not found and discovery is completed
+        return {
+            type: 'info',
+            title: 'Account does not exist',
+            shouldRender: false,
+        };
+    }
+
+    // case default: account information isn't loaded yet
+    return {
+        type: 'progress',
+        title: 'Loading account',
+        shouldRender: false,
+    };
 };
 
 const getAccountNotification = (state: State, selectedAccount: SelectedAccountState): ?AccountStatus => {
     const device = state.wallet.selectedDevice;
-    const { network, discovery } = selectedAccount;
+    const { account, network, discovery } = selectedAccount;
+    if (!device || !network) return null;
 
-    if (device && network) {
+    // case 1: backend status
-        const blockchain = state.blockchain.find(b => b.shortcut === network.shortcut);
+    const blockchain = state.blockchain.find(b => b.shortcut === network.shortcut);
-        if (blockchain && !blockchain.connected) {
+    if (blockchain && !blockchain.connected) {
-            return {
+        return {
-                type: 'backend',
+            type: 'backend',
-                title: `${network.name} backend is not connected`,
+            title: `${network.name} backend is not connected`,
-                shouldRender: false,
+            shouldRender: false,
-            };
+        };
-        }
+    }
 
-        if (discovery) {
+    // case 2: account does exists and it's visible but shouldn't be active
-            if (discovery && !discovery.completed && !discovery.waitingForDevice) {
+    if (account && discovery && !discovery.completed && !discovery.waitingForDevice) {
-                return {
+        return {
-                    type: 'info',
+            type: 'info',
-                    title: 'Loading accounts...',
+            title: 'Loading other accounts...',
-                    shouldRender: true,
+            shouldRender: true,
-                };
+        };
-            }
+    }
-        }
 
-        // Additional status: account does exists and it's visible but shouldn't be active
+    // case 3: account does exists and device is disconnected
-        if (!device.connected) {
+    if (!device.connected) {
-            return {
+        return {
-                type: 'info',
+            type: 'info',
-                title: `Device ${device.instanceLabel} is disconnected`,
+            title: `Device ${device.instanceLabel} is disconnected`,
-                shouldRender: true,
+            shouldRender: true,
-            };
+        };
-        }
+    }
-        if (!device.available) {
+
-            return {
+    // case 4: account does exists and device is unavailable (created with different passphrase settings) account cannot be accessed
-                type: 'info',
+    // this is related to device instance in url, it's not used for now (device clones are disabled)
-                title: `Device ${device.instanceLabel} is unavailable`,
+    if (!device.available) {
-                message: 'Change passphrase settings to use this device',
+        return {
-                shouldRender: true,
+            type: 'info',
-            };
+            title: `Device ${device.instanceLabel} is unavailable`,
-        }
+            message: 'Change passphrase settings to use this device',
+            shouldRender: true,
+        };
     }
 
+    // case default
     return null;
 };