Merge branch 'develop' into refactor/remove-old-modal

Emurgo · Oct 19, 2023 · 30de499 · 30de499
2 parents 9399449 + 83dba11
commit 30de499
Show file tree

Hide file tree

Showing 21 changed files with 1,245 additions and 1,018 deletions.
diff --git a/apps/wallet-mobile/ios/Podfile.lock b/apps/wallet-mobile/ios/Podfile.lock
diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
@@ -956,11 +956,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -1029,11 +1025,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

diff --git a/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx b/apps/wallet-mobile/src/TxHistory/ActionsBanner.tsx
@@ -8,7 +8,7 @@ import {Linking, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {Icon, Spacer} from '../components'
 import {features} from '../features'
 import {useSend} from '../features/Send/common/SendContext'
-import {useSwapTouched} from '../features/Swap/common/SwapFormProvider'
+import {useSwapForm} from '../features/Swap/common/SwapFormProvider'
 import {actionMessages} from '../i18n/global-messages'
 import env from '../legacy/env'
 import {useMetrics} from '../metrics/metricsManager'
@@ -27,8 +27,8 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
   const navigateTo = useNavigateTo()
   const wallet = useSelectedWallet()
   const {resetForm} = useSend()
-  const {orderData, resetState} = useSwap()
-  const {resetTouches} = useSwapTouched()
+  const {orderData} = useSwap()
+  const {resetSwapForm} = useSwapForm()
   const {track} = useMetrics()
   const sellTokenInfo = useTokenInfo({
     wallet,
@@ -64,8 +64,7 @@ export const ActionsBanner = ({disabled = false}: {disabled: boolean}) => {
   }
 
   const handleOnSwap = () => {
-    resetTouches()
-    resetState()
+    resetSwapForm()
 
     track.swapInitiated({
       from_asset: [

diff --git a/...llet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx b/...llet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx
@@ -14,7 +14,7 @@ import {asQuantity, Quantities} from '../../../../../yoroi-wallets/utils'
 import {useNavigateTo} from '../../navigation'
 import {PoolIcon} from '../../PoolIcon/PoolIcon'
 import {useStrings} from '../../strings'
-import {useSwapTouched} from '../../SwapFormProvider'
+import {useSwapForm} from '../../SwapFormProvider'
 
 const PRECISION = 14
 
@@ -25,7 +25,7 @@ export const SelectPoolFromList = ({pools = []}: Props) => {
   const strings = useStrings()
   const wallet = useSelectedWallet()
   const {selectedPoolChanged, orderData} = useSwap()
-  const {poolTouched} = useSwapTouched()
+  const {poolTouched} = useSwapForm()
   const [selectedCardIndex, setSelectedCardIndex] = useState(orderData.selectedPoolId)
   const navigate = useNavigateTo()
   const {track} = useMetrics()