fix: Go to select token when clicking disabled input (#2876)

Signed-off-by: Juliano Lazzarotto <[email protected]> Co-authored-by: Juliano Lazzarotto <[email protected]>
Emurgo · Nov 8, 2023 · de04a93 · de04a93
1 parent 1ad9c1f
commit de04a93
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx b/apps/wallet-mobile/src/features/Swap/common/AmountCard/AmountCard.tsx
@@ -60,7 +60,7 @@ export const AmountCard = ({
         {label != null && <Text style={[styles.label, !isEmptyString(error) && styles.labelError]}>{label}</Text>}
 
         <View style={styles.content}>
-          <Pressable style={styles.amountWrapper} onPress={focusInput}>
+          <Pressable style={styles.amountWrapper} onPress={() => (noTokenSelected ? navigateTo?.() : focusInput())}>
             <TextInput
               keyboardType="numeric"
               autoComplete="off"
@@ -77,13 +77,14 @@ export const AmountCard = ({
               selectTextOnFocus
               onFocus={() => setIsFocused(true)}
               onBlur={() => setIsFocused(false)}
+              {...(noTokenSelected && {onPressIn: navigateTo})}
             />
           </Pressable>
 
           <Spacer width={7} />
 
           <View style={styles.rightSection}>
-            <TouchableOpacity onPress={() => navigateTo?.()}>
+            <TouchableOpacity onPress={navigateTo}>
               <View style={styles.sectionContainer}>
                 <Boundary loading={{fallback: <TokenIconPlaceholder />}} error={{fallback}}>
                   {noTokenSelected ? (

diff --git a/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx b/apps/wallet-mobile/src/features/Swap/common/SwapFormProvider.tsx
@@ -325,12 +325,14 @@ const swapFormReducer = (state: SwapFormState, action: SwapFormAction) => {
     switch (action.type) {
       case SwapFormActionType.SellTouched:
         draft.sellQuantity.isTouched = true
+        draft.sellQuantity.displayValue = ''
         draft.sellQuantity.error = undefined
 
         break
 
       case SwapFormActionType.BuyTouched:
         draft.buyQuantity.isTouched = true
+        draft.buyQuantity.displayValue = ''
         draft.buyQuantity.error = undefined
 
         break

diff --git a/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json b/apps/wallet-mobile/translations/messages/src/features/Swap/common/AmountCard/AmountCard.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 129,
       "column": 15,
-      "index": 4125
+      "index": 4188
     },
     "end": {
       "line": 132,
       "column": 3,
-      "index": 4208
+      "index": 4271
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 133,
       "column": 18,
-      "index": 4228
+      "index": 4291
     },
     "end": {
       "line": 136,
       "column": 3,
-      "index": 4317
+      "index": 4380
     }
   }
 ]