chore: release v1.643.0

.env.base

@@ -52,7 +52,7 @@ REACT_APP_FEATURE_READ_ONLY_ASSETS=true
 # swapper feature flags - other .env files will override these
 REACT_APP_FEATURE_COWSWAP=true
 REACT_APP_FEATURE_COWSWAP_GNOSIS=true
-REACT_APP_FEATURE_COWSWAP_ARBITRUM=false
+REACT_APP_FEATURE_COWSWAP_ARBITRUM=true
 REACT_APP_FEATURE_LIFI_SWAP=true
 REACT_APP_FEATURE_ONE_INCH=false
 REACT_APP_FEATURE_THOR_SWAP=true

.env.dev

@@ -1,7 +1,6 @@
 # feature flags
 REACT_APP_FEATURE_RFOX_REWARDS_TX_HISTORY=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
-REACT_APP_FEATURE_COWSWAP_ARBITRUM=true
 REACT_APP_FEATURE_CUSTOM_TOKEN_IMPORT=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE_CLAIMS=true
 

.env.develop

@@ -2,7 +2,6 @@
 REACT_APP_FEATURE_RFOX_REWARDS_TX_HISTORY=true
 REACT_APP_FEATURE_CHATWOOT=true
 REACT_APP_FEATURE_ARBITRUM_BRIDGE=true
-REACT_APP_FEATURE_COWSWAP_ARBITRUM=true
 REACT_APP_FEATURE_CUSTOM_TOKEN_IMPORT=true
 
 # mixpanel

src/assets/translations/en/main.json

@@ -2189,10 +2189,14 @@
     "poolDepth": "Pool Depth",
     "poolDepthDescription": "The healthiness of the pool",
     "totalDebtBalance": "Total Debt Balance",
+    "totalDebtBalanceDescription": "Cumulative Debt Balance in the lending pool",
     "totalCollateral": "Total Collateral",
+    "totalCollateralDescription": "Total Collateral added to the lending pool",
     "estCollateralizationRatio": "Est. Collateralization Ratio",
+    "estCollateralizationRatioDescription": "A flat Collateralization Ratio of 200% is currently in place. In the future, a dynamic ratio will balance between the maximum and minimum CR based on market conditions.",
     "collateralizationRatio": "Collateralization Ratio",
     "totalBorrowers": "Total Borrowers",
+    "totalBorrowersDescription": "Number of borrowers participating",
     "myLoanInformation": "My Loan Information",
     "loanInformation": "Loan Summary",
     "poolInformation": "Pool Information",
@@ -2212,11 +2216,12 @@
     "switchAssets": "Switch Assets",
     "backToLending": "Back to lending",
     "outstandingDebt": "Outstanding Debt",
+    "outstandingDebtDescription": "The amount of collateral you've borrowed",
     "collateral": "Collateral",
     "debt": "Debt",
-    "healthy": "Healthy",
-    "caution": "Caution",
-    "risky": "Risky",
+    "healthy": "Depth is optimal, loans are efficient.",
+    "caution": "Depth is moderate, expect some slippage on your borrow",
+    "risky": "Depth is low, high slippage likely on your borrow.",
     "confirmAndBorrow": "Confirm and Borrow",
     "confirmAndRepay": "Confirm and Repay",
     "borrowAgain": "Borrow Again",
@@ -2480,13 +2485,13 @@
     "noSupportedChainsDescription": "Add %{chainLabel} or connect to a wallet that supports it.",
     "confirmAndBridge": "Confirm & Bridge",
     "myStakedBalance": "My Staked Balance",
-    "myStakedBalanceHelper": "My Staked Balance",
-    "pendingRewardsBalance": "Pending Rewards Balance",
-    "pendingRewardsBalanceHelper": "Pending Rewards Balance",
+    "myStakedBalanceHelper": "The amount of FOX you have staked",
+    "pendingRewardsBalance": "Current Estimated Rewards Balance",
+    "pendingRewardsBalanceHelper": "This is only an estimate of your pending rewards based on epoch to date revenues. All accounting is done at epoch end and cannot be calculated exactly before the end of the month",
     "lifetimeRewards": "Lifetime Rewards",
-    "lifetimeRewardsHelper": "Lifetime Rewards",
+    "lifetimeRewardsHelper": "Lifetime rewards is the cumulative rewards from staking your FOX",
     "timeInPool": "Time in Pool",
-    "timeInPoolHelper": "Time in Pool",
+    "timeInPoolHelper": "Time in pool is the longest living deposit into rFOX",
     "myPosition": "My Position",
     "faq": {
       "title": "FAQ",

src/components/MultiHopTrade/components/MultiHopTradeConfirm/hooks/useApprovalTx.tsx

@@ -28,6 +28,8 @@ export const useApprovalTx = (
   const sellAssetAccountId = useAppSelector(state => selectHopSellAccountId(state, hopIndex))
 
   useEffect(() => {
+    setIsLoading(true)
+
     poll({
       fn: async () => {
         const adapter = assertGetEvmChainAdapter(tradeQuoteStep.sellAsset.chainId)

src/components/MultiHopTrade/components/TradeInput/components/ConfirmSummary.tsx

@@ -230,12 +230,10 @@ export const ConfirmSummary = ({
     }, [activeQuote, buyAssetFeeAsset])
 
   const shouldForceManualAddressEntry = useMemo(() => {
-    return (
-      !disableSmartContractSwap &&
-      Boolean(_isSmartContractSellAddress) &&
-      sellAsset?.chainId !== buyAsset.chainId
-    )
-  }, [_isSmartContractSellAddress, sellAsset, buyAsset, disableSmartContractSwap])
+    if (_isSmartContractSellAddress === undefined) return
+
+    return _isSmartContractSellAddress && sellAsset.chainId !== buyAsset.chainId
+  }, [_isSmartContractSellAddress, sellAsset, buyAsset])
 
   return (
     <>
@@ -290,11 +288,12 @@ export const ConfirmSummary = ({
           </Alert>
         )}
         <WithLazyMount
-          shouldUse={Boolean(receiveAddress) && !shouldForceManualAddressEntry}
+          shouldUse={Boolean(receiveAddress) && shouldForceManualAddressEntry === false}
+          shouldForceManualAddressEntry={shouldForceManualAddressEntry}
           component={RecipientAddress}
         />
         <WithLazyMount
-          shouldUse={!walletSupportsBuyAssetChain || shouldForceManualAddressEntry}
+          shouldUse={!walletSupportsBuyAssetChain || shouldForceManualAddressEntry === true}
           shouldForceManualAddressEntry={shouldForceManualAddressEntry}
           component={ManualAddressEntry}
           description={

src/components/MultiHopTrade/components/TradeInput/components/RecipientAddress.tsx

@@ -33,7 +33,13 @@ const editIcon = <EditIcon />
 const checkIcon = <CheckIcon />
 const closeIcon = <CloseIcon />
 
-export const RecipientAddress = () => {
+type RecipientAddressProps = {
+  shouldForceManualAddressEntry?: boolean
+}
+
+export const RecipientAddress: React.FC<RecipientAddressProps> = ({
+  shouldForceManualAddressEntry,
+}) => {
   const translate = useTranslate()
   const dispatch = useAppDispatch()
   const wallet = useWallet().state.wallet
@@ -148,7 +154,7 @@ export const RecipientAddress = () => {
 
   const handleFormSubmit = useMemo(() => handleSubmit(onSubmit), [handleSubmit, onSubmit])
 
-  if (!receiveAddress) return null
+  if (!receiveAddress || shouldForceManualAddressEntry) return null
 
   return isRecipientAddressEditing ? (
     <form>

src/pages/Lending/AvailablePools.tsx

@@ -172,26 +172,26 @@ export const AvailablePools = () => {
         >
           <Text translation='lending.pool' />
           <Flex display={mobileDisplay}>
-            <HelperTooltip label={translate('lending.poolDepth')}>
+            <HelperTooltip label={translate('lending.poolDepthDescription')}>
               <Text translation='lending.poolDepth' />
             </HelperTooltip>
           </Flex>
           <Flex display={mobileDisplay}>
-            <HelperTooltip label={translate('lending.totalDebtBalance')}>
+            <HelperTooltip label={translate('lending.totalDebtBalanceDescription')}>
               <Text translation='lending.totalDebtBalance' />
             </HelperTooltip>
           </Flex>
-          <HelperTooltip label={translate('lending.totalCollateral')}>
+          <HelperTooltip label={translate('lending.totalCollateralDescription')}>
             <Text translation='lending.totalCollateral' />
           </HelperTooltip>
 
           <Flex display={largeDisplay}>
-            <HelperTooltip label={translate('lending.estCollateralizationRatio')}>
+            <HelperTooltip label={translate('lending.estCollateralizationRatioDescription')}>
               <Text translation='lending.estCollateralizationRatio' />
             </HelperTooltip>
           </Flex>
           <Flex display={largeDisplay}>
-            <HelperTooltip label={translate('lending.totalBorrowers')}>
+            <HelperTooltip label={translate('lending.totalBorrowersDescription')}>
               <Text translation='lending.totalBorrowers' />
             </HelperTooltip>
           </Flex>

src/pages/Lending/YourLoans.tsx

@@ -254,17 +254,17 @@ export const YourLoans = () => {
           </HelperTooltip>
         </Flex>
 
-        <HelperTooltip label={translate('lending.outstandingDebt')}>
+        <HelperTooltip label={translate('lending.outstandingDebtDescription')}>
           <Text translation='lending.outstandingDebt' textAlign='right' />
         </HelperTooltip>
 
         <Flex display={mobileDisplay}>
-          <HelperTooltip label={translate('lending.collateralValue')}>
+          <HelperTooltip label={translate('lending.collateralValueDescription')}>
             <Text translation='lending.collateralValue' textAlign='right' />
           </HelperTooltip>
         </Flex>
         <Flex display={largeDisplay}>
-          <HelperTooltip label={translate('lending.repaymentLock')}>
+          <HelperTooltip label={translate('lending.repaymentLockDescription')}>
             <Text translation='lending.repaymentLock' textAlign='right' />
           </HelperTooltip>
         </Flex>