Merge branch 'develop' into release/1.31.0

Author: taylorjdawson

src/interfaces.ts

@@ -563,6 +563,7 @@ export interface TermsAgreementState {
 
 export interface Ens {
   name?: string
+  avatar?: string
   contentHash?: string
   getText?: (key: string) => Promise<string | undefined>
 }

src/modules/select/index.ts

@@ -50,6 +50,13 @@ function select(
     : desktopDefaultWalletNames
 
   if (wallets) {
+    // For backwards compatibility if a user is still using 'detectedwallet' in the onboard wallet select array
+    // it will be filtered out so there are no duplicates
+    wallets = wallets.filter(
+      wallet =>
+        'walletName' in wallet ? wallet.walletName !== 'detectedwallet' : true // It is not a WalletInitOption but rather a WalletModule so let it through
+    )
+
     // If we detect an injected wallet then place the detected wallet
     // at the beginning of the list e.g. the of the wallet select modal
     if (injectedWalletDetected()) {
@@ -59,7 +66,7 @@ function select(
       wallets.map(wallet => {
         // If this is a wallet init object then load the built-in wallet module
         if (isWalletInit(wallet)) {
-          const { walletName, ...initParams } = wallet as WalletInitOptions
+          const { walletName, ...initParams } = wallet
           try {
             return getModule(walletName).then((m: any) =>
               m.default({ ...initParams, networkId, isMobile })

src/modules/select/wallets/keepkey/index.ts

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/camelcase */
+import * as ethUtil from 'ethereumjs-util'
 import {
   CommonWalletOptions,
   Helpers,
@@ -406,7 +407,7 @@ async function createKeepKeyProvider({
 
     const { signature } = await keepKeyWallet.ethSignMessage({
       addressNList,
-      message
+      message: ethUtil.toBuffer(message).toString('utf8')
     })
 
     return signature

src/utilities.ts

@@ -70,22 +70,21 @@ export function getAddress(provider: any): Promise<string | any> {
 
 export async function getEns(provider: any, address: string): Promise<Ens> {
   const { networkId } = get(app)
-  const ens = new ENS({ provider, ensAddress: getEnsAddress(networkId) })
-  let name
-  let nameInterface
-  let contentHash
   try {
-    ;({ name } = await ens.getName(address))
-    nameInterface = await ens.name(name)
-    contentHash = await nameInterface?.getContent()
+    const ens = new ENS({ provider, ensAddress: getEnsAddress(networkId) })
+    const { name } = await ens.getName(address)
+    const nameInterface = await ens.name(name)
+    const contentHash = await nameInterface?.getContent()
+    const avatar = await nameInterface?.getText('avatar')
+    return {
+      name,
+      avatar,
+      contentHash,
+      getText: nameInterface?.getText.bind(nameInterface)
+    }
   } catch (e) {
-    // Error getting ens name
-  }
-
-  return {
-    name,
-    contentHash,
-    getText: nameInterface?.getText.bind(nameInterface)
+    // Error getting ens
+    return {}
   }
 }