Merge pull request #40 from blocknative/develop

Release 0.2.3
blocknative · Oct 28, 2019 · c6aaa54 · c6aaa54
2 parents 817efd4 + a46d8fe
commit c6aaa54
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "files": [

diff --git a/rollup.config.js b/rollup.config.js
@@ -32,7 +32,17 @@ export default [
       babel({ exclude: "node_modules/**" }),
       builtins(),
       terser()
-    ]
+    ],
+    moduleContext: id => {
+      const thisAsWindowForModules = [
+        "node_modules/intl-messageformat/lib/core.js",
+        "node_modules/intl-messageformat/lib/compiler.js"
+      ]
+
+      if (thisAsWindowForModules.some(id_ => id.trimRight().endsWith(id_))) {
+        return "window"
+      }
+    }
   },
   {
     input: "src/index.js",
@@ -56,6 +66,16 @@ export default [
       commonjs(),
       babel({ exclude: "node_modules/**" })
     ],
+    moduleContext: id => {
+      const thisAsWindowForModules = [
+        "node_modules/intl-messageformat/lib/core.js",
+        "node_modules/intl-messageformat/lib/compiler.js"
+      ]
+
+      if (thisAsWindowForModules.some(id_ => id.trimRight().endsWith(id_))) {
+        return "window"
+      }
+    },
     output: [
       {
         dir: "dist/esm",

diff --git a/src/views/WalletSelect.svelte b/src/views/WalletSelect.svelte
@@ -37,8 +37,16 @@
 
   $: if ($app.autoSelectWallet) {
     const module = deviceWallets.find(m => m.name === $app.autoSelectWallet);
-    handleWalletSelect(module);
+    if (module) {
+      handleWalletSelect(module);
+    } else {
+      setModalData();
+    }
   } else {
+    setModalData();
+  }
+
+  function setModalData() {
     if (deviceWallets.find(wallet => wallet.preferred)) {
       // if preferred wallets, then split in to preferred and not preferred
       primaryWallets = deviceWallets.filter(wallet => wallet.preferred);