Experimental code cleanup and a bug fix on provider

KaffinPX · Sep 15, 2024 · 83d1a60 · 83d1a60
1 parent 21cf959
commit 83d1a60
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/pages/Wallet/Send.tsx b/src/pages/Wallet/Send.tsx
@@ -17,7 +17,7 @@ import { Input } from "@/components/ui/input"
 import { Dialog } from "@/components/ui/dialog"
 import useURLParams from "@/hooks/useURLParams"
 import useKaspa from "@/hooks/useKaspa"
-import { CustomInput } from "@/provider/protocol"
+import { Input as KaspaInput } from "@/provider/protocol"
 
 export enum Tabs {
   Creation,
@@ -29,10 +29,10 @@ export default function SendDrawer () {
   const { kaspa, request } = useKaspa()
   const [ hash, params ] = useURLParams()
 
-  const [ outputs, setOutputs ] = useState<[ string, string ][]>(JSON.parse(params.get('outputs') ?? `[[ "", "" ]]`))
-  const [ fee ] = useState(params.get('fee') ?? "0")
+  const [ inputs ] = useState<KaspaInput[]>(JSON.parse(params.get('inputs')!) || [])
+  const [ outputs, setOutputs ] = useState<[ string, string ][]>(JSON.parse(params.get('outputs')!) || [["", ""]])
   const [ feeRate, setFeerate ] = useState(1)
-  const [ inputs ] = useState<CustomInput[]>(JSON.parse(params.get('inputs') ?? `[]`))
+  const [ fee ] = useState(params.get('fee') ?? "0")
   const [ transactions, setTransactions ] = useState<string[]>()
   const [ error, setError ] = useState("")
   const [ tab, setTab ] = useState(Tabs.Creation)
@@ -152,7 +152,7 @@ export default function SendDrawer () {
                 </Button>
               </div>
             </div>
-            <div className="flex items-center gap-1 h-6 -mt-4">
+            <div className="flex items-center gap-1 h-6 -mt-3">
               <TargetIcon size={18} />
               <p className="font-semibold text-sm">
                 Priority
@@ -181,7 +181,7 @@ export default function SendDrawer () {
                 default
               </Button>
             </div>
-            <Button className={"gap-2"} disabled={!!transactions} onClick={initiateSend}>
+            <Button className={"gap-2"} disabled={!!transactions} onClick={initiateSend} autoFocus>
               <SendToBack />
               {i18n.getMessage('send')}
             </Button>

diff --git a/src/wallet/messaging/protocol.ts b/src/wallet/messaging/protocol.ts
@@ -78,7 +78,7 @@ export interface EventMessage<M extends keyof EventMappings = keyof EventMapping
 }
 
 export type Event<M extends keyof EventMappings = keyof EventMappings> = {
-  [ K in M]: EventMessage<K>
+  [ K in M ]: EventMessage<K>
 }[ M ]
 
 export function isEvent (message: any): message is Event {

diff --git a/src/wallet/messaging/wallet/provider/index.ts b/src/wallet/messaging/wallet/provider/index.ts
@@ -103,8 +103,9 @@ export default class Provider extends EventEmitter {
           this.submitEvent(request.id, 'transact', transaction)
         } else {
           this.submitEvent(request.id, 'transact', false, 'User rejected the request.')
-          this.account.transactions.off('transaction', appendTransaction)
         }
+
+        this.account.transactions.off('transaction', appendTransaction)
       })
 
       this.account.transactions.once('transaction', appendTransaction)