Merge pull request #407 from blocknative/enhancement/update-dependencies

Enhancement: Update dependencies

Closes #407

Author: lnbc1QWFyb24

package.json

@@ -45,24 +45,24 @@
     "typescript": "^3.6.4"
   },
   "dependencies": {
-    "@ledgerhq/hw-app-eth": "^5.19.0",
-    "@ledgerhq/hw-transport-u2f": "^5.19.0",
-    "@portis/web3": "^2.0.0-beta.55",
-    "@toruslabs/torus-embed": "^1.8.1",
-    "@unilogin/provider": "^0.5.21",
-    "@walletconnect/web3-provider": "^1.0.13",
+    "@ledgerhq/hw-app-eth": "^5.21.0",
+    "@ledgerhq/hw-transport-u2f": "^5.21.0",
+    "@portis/web3": "^2.0.0-beta.57",
+    "@toruslabs/torus-embed": "^1.8.2",
+    "@unilogin/provider": "^0.6.1",
+    "@walletconnect/web3-provider": "^1.1.0",
     "authereum": "^0.0.4-beta.157",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "^2.1.4",
-    "bowser": "^2.5.2",
+    "bowser": "^2.10.0",
     "ethereumjs-tx": "^2.1.2",
-    "ethereumjs-util": "^6.2.0",
-    "ethereumjs-wallet": "^0.6.3",
-    "fortmatic": "^0.8.2",
-    "hdkey": "^1.1.1",
-    "regenerator-runtime": "^0.13.3",
+    "ethereumjs-util": "^7.0.3",
+    "ethereumjs-wallet": "^1.0.0",
+    "fortmatic": "^2.2.1",
+    "hdkey": "^2.0.1",
+    "regenerator-runtime": "^0.13.7",
     "squarelink": "^1.1.4",
-    "trezor-connect": "^8.1.2",
+    "trezor-connect": "^8.1.9",
     "walletlink": "^2.0.2",
     "web3-provider-engine": "^15.0.4"
   },

src/@types/index.d.ts

@@ -15,23 +15,3 @@ declare module '@ledgerhq/hw-transport-u2f'
 
 declare module '*.png'
 declare module '*.svg'
-
-declare module 'svelte-i18n' {
-  interface Options {
-    fallback: string
-    navigator: boolean
-  }
-  export function getClientLocale(options: Options): string
-
-  export namespace _ {
-    export function subscribe(dictionary: any): void
-  }
-
-  export namespace dictionary {
-    export function set(dictionary: any): void
-  }
-
-  export namespace locale {
-    export function set(locale: string): void
-  }
-}

src/modules/select/wallets/fortmatic.ts

@@ -19,34 +19,44 @@ function fortmatic(
         apiKey,
         networkId === 1 ? undefined : networkName(networkId)
       )
+
       const provider = instance.getProvider()
-      const { BigNumber } = helpers
+      const { BigNumber, getAddress } = helpers
+
+      let enabled: boolean
 
       return {
         provider,
         instance,
         interface: {
           name: 'Fortmatic',
-          connect: instance.user.login,
-          disconnect: instance.user.logout,
+          connect: () =>
+            instance.user.login().then((res: any) => {
+              enabled = true
+              return res
+            }),
+          disconnect: () => instance.user.logout(),
           address: {
-            get: () => Promise.resolve(provider.account)
+            get: () => (enabled ? getAddress(provider) : Promise.resolve())
           },
           network: {
             get: () => Promise.resolve(networkId)
           },
           balance: {
-            get: () =>
-              provider.account &&
-              instance.user
-                .getBalances()
-                .then((res: any) =>
-                  res[0]
-                    ? BigNumber(res[0].crypto_amount)
-                        .times(BigNumber('1000000000000000000'))
-                        .toString(10)
-                    : null
-                )
+            get: async () => {
+              return (
+                enabled &&
+                instance.user
+                  .getBalances()
+                  .then((res: any) =>
+                    res[0]
+                      ? BigNumber(res[0].crypto_amount)
+                          .times(BigNumber('1000000000000000000'))
+                          .toString(10)
+                      : null
+                  )
+              )
+            }
           },
           dashboard: () => instance.user.settings()
         }