From 2bbc642bc36b02bc96af4bfdd39a31524fcf799f Mon Sep 17 00:00:00 2001
From: Jean Carlo Noguera <jcnoguera@boxfish.studio>
Date: Mon, 25 Sep 2023 09:49:57 +0200
Subject: [PATCH] fix: avoid crash when changing tab in send asset popup

---
 packages/shared/components/inputs/NftInput.svelte    | 12 ++++++------
 .../nfts/actions/getNftByIdFromAllAccountNfts.ts     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/shared/components/inputs/NftInput.svelte b/packages/shared/components/inputs/NftInput.svelte
index 2f8e8135df2..fcc7edeef77 100644
--- a/packages/shared/components/inputs/NftInput.svelte
+++ b/packages/shared/components/inputs/NftInput.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Modal, SelectorInput, IOption, NftImageOrIconBox, NftSize } from 'shared/components'
-    import { ownedNfts } from '@core/nfts'
+    import { INft, ownedNfts } from '@core/nfts'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts'
     import { selectedAccountIndex } from '@core/account'
     import { localize } from '@core/i18n'
@@ -8,18 +8,18 @@
 
     export let nftId: string = ''
     export let error: string = ''
-    export let readonly: boolean = null
+    export let readonly: boolean | null = null
 
-    let inputElement: HTMLInputElement = undefined
+    let selectedNftById: INft | undefined
     let modal: Modal = undefined
-    let selected: IOption = nftId
-        ? { key: getNftByIdFromAllAccountNfts($selectedAccountIndex, nftId).name, value: nftId }
-        : {}
+    let inputElement: HTMLInputElement | undefined = undefined
+    let selected: IOption = selectedNftById ? { key: selectedNftById.name, value: selectedNftById.id } : {}
 
     const nftOptions: IOption[] = $ownedNfts
         .filter((nft) => nft.isSpendable && (!nft.timelockTime || nft.timelockTime < $time.getTime()))
         .map((_nft) => ({ key: _nft.name, value: _nft.id }))
 
+    $: selectedNftById = getNftByIdFromAllAccountNfts($selectedAccountIndex, nftId)
     $: nftId = selected?.value
 
     export async function validate(): Promise<void> {
diff --git a/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
index 2e0d661f8ea..88504d2156f 100644
--- a/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
@@ -2,6 +2,6 @@ import { allAccountNfts } from '../stores'
 import { INft } from '../interfaces'
 import { get } from 'svelte/store'
 
-export function getNftByIdFromAllAccountNfts(accountIndex: number, nftId: string): INft {
+export function getNftByIdFromAllAccountNfts(accountIndex: number, nftId: string): INft | undefined {
     return get(allAccountNfts)[accountIndex]?.find((_nft) => _nft.id === nftId)
 }