Merge pull request #470 from chaitanyapotti/master

Fix Torus integration

Author: dmarzzz

package.json

@@ -48,7 +48,7 @@
     "@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",
+    "@toruslabs/torus-embed": "^1.9.2",
     "@unilogin/provider": "^0.6.1",
     "@walletconnect/web3-provider": "^1.3.1",
     "authereum": "^0.1.12",

src/interfaces.ts

@@ -274,7 +274,8 @@ interface LocaleLinks<T> {
   ja?: T
   ko?: T
   de?: T
-  zh?: T
+  zh?: T,
+  es?: T,
 }
 
 interface ThemeParams {
@@ -283,15 +284,19 @@ interface ThemeParams {
 }
 
 interface LoginConfigItem {
-  name?: string
+  name: string
   typeOfLogin: LOGIN_TYPE
   description?: string
   clientId?: string
   logoHover?: string
   logoLight?: string
   logoDark?: string
   showOnModal?: boolean
+  showOnMobile?: boolean
+  showOnDesktop?: boolean
+  mainOption?: boolean
   jwtParameters?: JwtParameters
+  priority?: number
 }
 
 interface LoginConfig {
@@ -302,7 +307,7 @@ export interface TorusOptions extends CommonWalletOptions {
   buttonPosition?: 'top-left' | 'top-right' | 'bottom-right' | 'bottom-left'
   modalZIndex?: number
   apiKey?: string
-  buildEnv?: 'production' | 'development' | 'staging' | 'testing' | 'lrc'
+  buildEnv?: 'production' | 'development' | 'binance' | 'testing' | 'lrc' | 'beta'
   enableLogging?: boolean
   enabledVerifiers?: VerifierStatus
   loginConfig?: LoginConfig

src/modules/select/wallets/torus.ts

@@ -1,5 +1,5 @@
 import { networkName } from '../../../utilities'
-import { TorusOptions, WalletModule } from '../../../interfaces'
+import { Helpers, TorusOptions, WalletModule } from '../../../interfaces'
 
 import torusIcon from '../wallet-icons/icon-torus'
 
@@ -27,7 +27,11 @@ function torus(options: TorusOptions & { networkId: number }): WalletModule {
     name: label || 'Torus',
     svg: svg || torusIcon,
     iconSrc,
-    wallet: async () => {
+    wallet: async (helpers: Helpers) => {
+      const {
+        createModernProviderInterface
+      } = helpers
+
       const { default: Torus } = await import('@toruslabs/torus-embed')
       const instance = new Torus({
         buttonPosition, // default: bottom-left
@@ -54,37 +58,17 @@ function torus(options: TorusOptions & { networkId: number }): WalletModule {
 
       return {
         provider,
-        instance,
         interface: {
+          ...createModernProviderInterface(provider),
           name: 'Torus',
+          dashboard: () => instance.showWallet('home'),
           connect: async () => {
             const result = await instance.login({ verifier: loginMethod })
             return { message: result[0] }
           },
           disconnect: () => instance.cleanUp(),
-          address: {
-            get: () => Promise.resolve(instance.web3.eth.accounts[0])
-          },
-          network: {
-            get: () => Promise.resolve(Number(instance.web3.version.network))
-          },
-          balance: {
-            get: () =>
-              new Promise(async (resolve, reject) => {
-                instance.web3.eth.getBalance(
-                  instance.web3.eth.accounts[0],
-                  (err: any, data: any) => {
-                    if (err) {
-                      reject(`Error while checking Balance: ${err}`)
-                    } else {
-                      resolve(data.toString(10))
-                    }
-                  }
-                )
-              })
-          },
-          dashboard: () => instance.showWallet('home')
-        }
+        },
+        instance
       }
     },
     type: 'sdk',