1.29.0-0.2.0: [fix] Keepkey issues (#607)

* 1.29.0-0.2.0: Move CTA, Enter btn, Preferred

* version bump

* Fix formatting

* Remove cta change

* Fixx format

Co-authored-by: Aaron Barnard <abarnard@protonmail.com>

Author: taylorjdawson

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.29.0-0.1.0",
+  "version": "1.29.0-0.2.0",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",

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

@@ -56,7 +56,7 @@ const pinButtons = `
 const delButtonIcon = `<svg class="del-button-icon" viewBox="0 0 24 24" focusable="false" class="chakra-icon css-onkibi" aria-hidden="true"><path fill="currentColor" d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"></path></svg>`
 
 const pinPhraseInput = (modalType: ModalType) => `
-<form class="pin-phrase-input-container">
+<form id="pin-phrase-form" class="pin-phrase-input-container">
   <input
     id="pin-phrase-input"
     placeholder="${modalType === ModalType.Pin ? 'PIN' : ''}"
@@ -254,6 +254,20 @@ export const renderModal = (wallet: KeepKeyHDWallet, modalType: ModalType) => {
     }
   } as SvelteComponentDev['new'])
 
+  // Submits the pin or passphrase to the Keepkey device
+  const submit = async () => {
+    const value = getInput().value
+    modalType === ModalType.Pin
+      ? await wallet.sendPin(value)
+      : await wallet.sendPassphrase(value)
+    pinModal.$destroy()
+  }
+
+  document.getElementById('pin-phrase-form')?.addEventListener('submit', e => {
+    e.preventDefault()
+    submit()
+  })
+
   // Creates a new Button component used to trigger sending the pin to Keepkey
   const entryEl = document.getElementById('entry')
   if (entryEl) {
@@ -264,13 +278,7 @@ export const renderModal = (wallet: KeepKeyHDWallet, modalType: ModalType) => {
       target: entryEl,
       props: {
         onclick: async () => {
-          const value = getInput().value
-
-          modalType === ModalType.Pin
-            ? await wallet.sendPin(value)
-            : await wallet.sendPassphrase(value)
-
-          pinModal.$destroy()
+          submit()
           deleteWindowProperties()
         },
         $$slots: createSlot(span),

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

@@ -41,7 +41,7 @@ interface KeepProviderOptions {
 function keepkey(
   options: CommonWalletOptions & { rpcUrl: string; networkId: number }
 ): WalletModule {
-  const { label, iconSrc, rpcUrl, networkId } = options
+  const { label, iconSrc, rpcUrl, networkId, preferred } = options
 
   // Used to signal if the keep key could not be paired or if the keep key is already paired with another app
   let installMessage: string
@@ -90,7 +90,8 @@ function keepkey(
         : '',
     type: 'hardware',
     mobile: false,
-    desktop: true
+    desktop: true,
+    preferred
   }
 }
 

src/views/WalletCheck.svelte

@@ -363,9 +363,8 @@
       {#if loading}
         <Spinner />
       {/if}
-      <Button position="right" onclick={() => handleExit(false)}>
-        Dismiss
-      </Button>
+      <Button position="right" onclick={() => handleExit(false)}>Dismiss</Button
+      >
     </div>
   </Modal>
 {/if}