Merge pull request #948 from Koniverse/issue-939

[Issue-939]: Fix bug related to SendFund
Koniverse · Aug 15, 2023 · 2c945d3 · 2c945d3
2 parents b5aaf71 + 4157936
commit 2c945d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/components/Modal/common/ChainSelector.tsx b/src/components/Modal/common/ChainSelector.tsx
@@ -10,6 +10,7 @@ interface Props {
   onSelectItem?: (item: ChainInfo) => void;
   renderSelected?: () => JSX.Element;
   disabled?: boolean;
+  acceptDefaultValue?: boolean;
   chainSelectorRef: React.MutableRefObject<ModalRef | undefined>;
 }
 
@@ -19,6 +20,7 @@ export const ChainSelector = ({
   onSelectItem,
   renderSelected,
   disabled,
+  acceptDefaultValue,
   chainSelectorRef,
 }: Props) => {
   return (
@@ -30,6 +32,7 @@ export const ChainSelector = ({
       onSelectItem={onSelectItem}
       renderSelected={renderSelected}
       disabled={disabled}
+      acceptDefaultValue={acceptDefaultValue}
       placeholder={i18n.placeholder.searchNetwork}
       ref={chainSelectorRef}
       onBackButtonPress={() => chainSelectorRef?.current?.onCloseModal()}

diff --git a/src/screens/Transaction/SendFundV2/index.tsx b/src/screens/Transaction/SendFundV2/index.tsx
@@ -580,11 +580,7 @@ export const SendFund = ({
       if (currentDestChainItems.some(destChainItem => destChainItem.slug === item.originChain)) {
         setValue('destChain', item.originChain);
       } else {
-        if (currentDestChainItems.length === 1) {
-          setValue('destChain', currentDestChainItems[0].slug);
-        } else {
-          setValue('destChain', '');
-        }
+        setValue('destChain', '');
       }
     } else {
       setValue('destChain', item.originChain);
@@ -942,6 +938,7 @@ export const SendFund = ({
                 <View style={stylesheet.rowItem}>
                   <ChainSelector
                     items={viewStep === 1 ? destChainItems : destChainItemsViewStep2}
+                    acceptDefaultValue={viewStep === 2 && destChainItemsViewStep2.length === 1}
                     selectedValueMap={{ [destChainValue]: true }}
                     chainSelectorRef={chainSelectorRef}
                     onSelectItem={_onChangeDestChain}