Add ledger connection hint, remove logs

Author: lnbc1QWFyb24

src/interfaces.ts

@@ -39,6 +39,7 @@ export interface WalletCheckModal {
   action?: () => Promise<{ message: string } | undefined>
   loading?: Promise<undefined>
   icon?: string
+  hint?: string
 }
 
 export interface WalletSelectModalData {

src/modules/check/connect.ts

@@ -12,10 +12,20 @@ function connect() {
         loading: wallet.loading,
         icon: `
         <svg height="14" viewBox="0 0 18 14" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="currentColor"><path d="m10.29375 4.05351563c0-.04921875 0-.09140625 0-.13007813 0-1.0546875 0-2.109375 0-3.1640625 0-.43945312.3480469-.76992188.7804688-.7453125.2003906.01054688.3585937.10546875.4992187.24609375.5800781.58359375 1.1566406 1.16367188 1.7367187 1.74023438 1.4695313 1.46953125 2.9390625 2.93906249 4.4050782 4.40859375.1335937.13359375.2425781.27421875.2707031.46757812.0351562.20742188-.0246094.421875-.1652344.58007813-.0246094.028125-.0492187.05273437-.0738281.08085937-2.0601563 2.06367188-4.1203125 4.1238281-6.1804688 6.1875-.2109375.2109375-.4570312.3023438-.7453125.2179688-.2707031-.0808594-.4464843-.2707032-.5132812-.5484375-.0140625-.0738282-.0175781-.1441407-.0140625-.2179688 0-1.0335937 0-2.0707031 0-3.1042969 0-.0386719 0-.08085935 0-.13359372h-5.06953125c-.49570313 0-.80507813-.309375-.80507813-.80859375 0-1.42382813 0-2.84414063 0-4.26796875 0-.49570313.30585938-.8015625.8015625-.8015625h4.93593748z"/><path d="m5.69882812 13.978125h-4.01132812c-.928125 0-1.6875-.8753906-1.6875-1.9511719v-10.06171872c0-1.07578125.75585938-1.95117188 1.6875-1.95117188h4.01132812c.34101563 0 .61523438.31992188.61523438.71015625 0 .39023438-.27421875.71015625-.61523438.71015625h-4.01132812c-.253125 0-.45703125.23554688-.45703125.52734375v10.06171875c0 .2917969.20390625.5273437.45703125.5273437h4.01132812c.34101563 0 .61523438.3199219.61523438.7101563s-.27773438.7171875-.61523438.7171875z"/></g></svg>
-        `
+        `,
+        hint: connectHint(wallet.name)
       }
     }
   }
 }
 
+function connectHint(walletName: string) {
+  switch (walletName) {
+    case 'Ledger':
+      return 'Make sure your Ledger wallet is plugged in, unlocked and has the Ethereum app open and then click connect.'
+    default:
+      return undefined
+  }
+}
+
 export default connect

src/modules/select/wallets/ledger.ts

@@ -89,7 +89,7 @@ async function ledgerProvider(options: {
     getAccounts: (callback: any) => {
       getAccounts()
         .then((res: Array<any> | undefined) => callback(null, res))
-        .catch(err => callback(err, null))
+        .catch((err: string) => callback(err, null))
     },
     signTransaction: (transactionData: any, callback: any) => {
       signTransaction(transactionData)
@@ -165,58 +165,60 @@ async function ledgerProvider(options: {
     listener && listener(addresses())
   }
 
-  async function getAccounts(numberToGet: number = 1, getMore?: boolean) {
-    console.log('get accounts called:', { numberToGet, getMore: getMore })
-    if (!enabled) {
-      return [null]
-    }
+  function getAccounts(
+    numberToGet: number = 1,
+    getMore?: boolean
+  ): Promise<any[]> {
+    return new Promise(async (resolve, reject) => {
+      if (!enabled) {
+        resolve([null])
+      }
 
-    const addressesAlreadyFetched = addressToPath.size
+      const addressesAlreadyFetched = addressToPath.size
 
-    if (addressesAlreadyFetched > 0 && !getMore) {
-      console.log('already have 1 address')
-      return addresses()
-    }
+      if (addressesAlreadyFetched > 0 && !getMore) {
+        return addresses()
+      }
 
-    const paths = []
-
-    if (numberToGet > 1) {
-      for (
-        let i = addressesAlreadyFetched;
-        i < numberToGet + addressesAlreadyFetched;
-        i++
-      ) {
-        const ledgerPath = `${basePath}/0'/${i}`
-        const bipPath = `${basePath}/${i}'/0/0`
-        paths.push(ledgerPath, bipPath)
+      const paths = []
+
+      if (numberToGet > 1) {
+        for (
+          let i = addressesAlreadyFetched;
+          i < numberToGet + addressesAlreadyFetched;
+          i++
+        ) {
+          const ledgerPath = `${basePath}/0'/${i}`
+          const bipPath = `${basePath}/${i}'/0/0`
+          paths.push(ledgerPath, bipPath)
+        }
+      } else {
+        paths.push(`${basePath}/0'/0`)
       }
-    } else {
-      paths.push(`${basePath}/0'/0`)
-    }
 
-    console.log('creating transport')
-    const transport = await TransportU2F.create()
-    const eth = new Eth(transport)
-    console.log('transport created')
-
-    for (const path of paths) {
-      try {
-        console.log('getting address for path:', path)
-        const { address } = await eth.getAddress(path)
-        addressToPath.set(address.toLowerCase(), path)
-      } catch (err) {
-        console.log({ err })
+      const transport = await TransportU2F.create()
+      const eth = new Eth(transport)
+
+      for (const path of paths) {
+        try {
+          const { address } = await eth.getAddress(path)
+          addressToPath.set(address.toLowerCase(), path)
+        } catch (err) {
+          return reject({
+            message: 'An error occurred when trying to get account information'
+          })
+        }
       }
-    }
 
-    const allAddresses = addresses()
+      const allAddresses = addresses()
 
-    const listener = listeners.get('accountsChanged')
-    listener && listener(allAddresses)
+      const listener = listeners.get('accountsChanged')
+      listener && listener(allAddresses)
 
-    transport.close()
+      transport.close()
 
-    return allAddresses
+      resolve(allAddresses)
+    })
   }
 
   function getBalance(address: string) {
@@ -260,7 +262,6 @@ async function ledgerProvider(options: {
 
       return `0x${transaction.serialize().toString('hex')}`
     } catch (error) {
-      console.log({ error })
       throw new Error(error)
     } finally {
       transport.close()

src/modules/select/wallets/trezor.ts

@@ -282,27 +282,21 @@ async function trezorProvider(options: {
   async function signTransaction(transactionData: any) {
     const path = [...addressToPath.values()][0]
 
-    try {
-      const transaction = new EthereumTx(transactionData, {
-        chain: networkName(networkId)
-      })
-      const trezorResult = await trezorSignTransaction(path, transactionData)
+    const transaction = new EthereumTx(transactionData, {
+      chain: networkName(networkId)
+    })
+    const trezorResult = await trezorSignTransaction(path, transactionData)
 
-      if (!trezorResult.success) {
-        console.log('error', trezorResult.payload.error)
-        throw new Error(trezorResult.payload.error)
-      }
+    if (!trezorResult.success) {
+      throw new Error(trezorResult.payload.error)
+    }
 
-      const signature = trezorResult.payload
-      transaction.v = signature.v
-      transaction.r = signature.r
-      transaction.s = signature.s
+    const signature = trezorResult.payload
+    transaction.v = signature.v
+    transaction.r = signature.r
+    transaction.s = signature.s
 
-      return `0x${transaction.serialize().toString('hex')}`
-    } catch (error) {
-      console.log({ error })
-      throw new Error(error)
-    }
+    return `0x${transaction.serialize().toString('hex')}`
   }
 
   return provider

src/validation.ts

@@ -359,6 +359,7 @@ export function validateModal(modal: WalletCheckModal): never | void {
     icon,
     loading,
     html,
+    hint,
     ...otherParams
   } = modal
 
@@ -371,7 +372,9 @@ export function validateModal(modal: WalletCheckModal): never | void {
       'eventCode',
       'action',
       'icon',
-      'heading'
+      'loading',
+      'html',
+      'hint'
     ],
     'modal'
   )
@@ -407,6 +410,13 @@ export function validateModal(modal: WalletCheckModal): never | void {
     optional: true
   })
 
+  validateType({
+    name: 'hint',
+    value: hint,
+    type: 'string',
+    optional: true
+  })
+
   if (button) {
     const { onclick, text, ...restParams } = button
     invalidParams(restParams, ['onclick', 'text'], 'button')

src/views/WalletCheck.svelte

@@ -270,6 +270,9 @@
     <p class="bn-onboard-custom bn-onboard-prepare-description">
       {@html activeModal.description}
     </p>
+    {#if activeModal.hint}
+      <p>{activeModal.hint}</p>
+    {/if}
     {#if errorMsg}
       <span
         class:bn-onboard-dark-mode-background={$app.darkMode}