From c5fc98f8af2a3f16d041ea48e36fd7a88891e547 Mon Sep 17 00:00:00 2001
From: Yosif Hamed <josif.hameed@gmail.com>
Date: Tue, 21 May 2024 17:51:10 +0300
Subject: [PATCH] Fix default token transfer screen

---
 src/components/Wallet/Transfer/Send/Send.js | 1 +
 src/components/common/Select/Select.js      | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Wallet/Transfer/Send/Send.js b/src/components/Wallet/Transfer/Send/Send.js
index c348a08986..2fd46c070a 100644
--- a/src/components/Wallet/Transfer/Send/Send.js
+++ b/src/components/Wallet/Transfer/Send/Send.js
@@ -359,6 +359,7 @@ const Send = ({
       <div className={styles.content}>
         <Select
           searchable
+          preventDefaultFirst={asset!==null}
           defaultValue={asset}
           items={sortedAssetsItems}
           onChange={({ value }) => setAsset(value)}
diff --git a/src/components/common/Select/Select.js b/src/components/common/Select/Select.js
index 76cc8d7818..f38eed77bc 100644
--- a/src/components/common/Select/Select.js
+++ b/src/components/common/Select/Select.js
@@ -29,7 +29,8 @@ const Select = ({
   dragTarget,
   drop,
   draggableHeader,
-  displayDraggableHeader
+  displayDraggableHeader,
+  preventDefaultFirst
 }) => {
   const ref = useRef()
   const hiddenTextInput = useRef()
@@ -67,8 +68,8 @@ const Select = ({
   )
 
   useEffect(() => {
-    const item = items.find((item) => item.value === defaultValue) || items[0]
-    if (item && selectedItem.value !== item.value) selectItem(item)
+    const item = items.find((item) => item.value === defaultValue) || (preventDefaultFirst ? {} : items[0])
+    if (item && (selectedItem.value !== item.value || selectedItem.label !== item.label)) selectItem(item)
   }, [items, defaultValue, selectedItem, selectItem])
 
   useEffect(() => {