Merge branch 'develop' into feature/hardware-wallets

Author: lnbc1QWFyb24

src/components/Wallets.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import { onDestroy } from 'svelte'
-  import { fade } from 'svelte/transition'
   import Button from '../elements/Button.svelte'
   import IconButton from '../elements/IconButton.svelte'
   import { wallet } from '../stores'
@@ -29,10 +28,7 @@
     align-items: center;
     list-style-type: none;
     margin: 1.25em 0;
-    max-height: 66vh;
-    overflow-y: scroll;
     padding: 0;
-    scrollbar-width: none;
     font-family: inherit;
     font-size: inherit;
     line-height: 1.15;
@@ -62,14 +58,15 @@
     }
 
     ul {
-      scrollbar-width: unset;
+      max-height: 66vh;
+      overflow-y: scroll;
     }
   }
 </style>
 
 <ul class="bn-onboard-custom bn-onboard-modal-select-wallets">
-  {#each modalData.primaryWallets as wallet}
-    <li in:fade>
+  {#each modalData.primaryWallets as wallet, i (wallet.name)}
+    <li>
       <IconButton
         onclick={() => handleWalletSelect(wallet)}
         iconSrc={wallet.iconSrc}
@@ -90,8 +87,8 @@
   {/if}
 
   {#if showingAllWalletModules}
-    {#each modalData.secondaryWallets as wallet}
-      <li in:fade>
+    {#each modalData.secondaryWallets as wallet, i (wallet.name)}
+      <li>
         <IconButton
           onclick={() => handleWalletSelect(wallet)}
           iconSrc={wallet.iconSrc}

src/modules/select/wallets/metamask.ts

@@ -37,6 +37,7 @@ function metamask(options: CommonWalletOptions): WalletModule {
     link: 'https://metamask.io/',
     installMessage: extensionInstallMessage,
     desktop: true,
+    mobile: true,
     preferred
   }
 }

src/views/WalletSelect.svelte

@@ -67,31 +67,33 @@
         return !osExclusions.includes(os)
       })
 
+    if (deviceWallets.find(wallet => wallet.preferred)) {
+      // if preferred wallets, then split in to preferred and not preferred
+      primaryWallets = deviceWallets.filter(wallet => wallet.preferred)
+      secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred)
+    } else {
+      // otherwise make the first 4 wallets preferred
+      primaryWallets = deviceWallets.slice(0, 4)
+      secondaryWallets =
+        deviceWallets.length > 4 ? deviceWallets.slice(4) : undefined
+    }
+
+    modalData = {
+      heading,
+      description,
+      primaryWallets,
+      secondaryWallets
+    }
+
     if (appState.autoSelectWallet) {
       const module = deviceWallets.find(
         (m: WalletModule) => m.name === appState.autoSelectWallet
       )
 
       app.update(store => ({ ...store, autoSelectWallet: '' }))
 
-      module ? handleWalletSelect(module) : finish({ completed: false })
-    } else {
-      if (deviceWallets.find(wallet => wallet.preferred)) {
-        // if preferred wallets, then split in to preferred and not preferred
-        primaryWallets = deviceWallets.filter(wallet => wallet.preferred)
-        secondaryWallets = deviceWallets.filter(wallet => !wallet.preferred)
-      } else {
-        // otherwise make the first 4 wallets preferred
-        primaryWallets = deviceWallets.slice(0, 4)
-        secondaryWallets =
-          deviceWallets.length > 4 ? deviceWallets.slice(4) : undefined
-      }
-
-      modalData = {
-        heading,
-        description,
-        primaryWallets,
-        secondaryWallets
+      if (module) {
+        handleWalletSelect(module)
       }
     }
   }