aave · foodaka · May 8, 2025
diff --git a/src/components/transactions/DebtSwitch/DebtSwitchActions.tsx b/src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
@@ -280,14 +280,14 @@ export const DebtSwitchActions = ({
       amount={amountToSwap}
       handleApproval={() => approval()}
       requiresApproval={requiresApproval}
-      actionText={<Trans>Switch</Trans>}
+      actionText={<Trans>Swap</Trans>}
       actionInProgressText={<Trans>Switching</Trans>}
       sx={sx}
       fetchingData={loading}
       errorParams={{
         loading: false,
         disabled: blocked || !approvalTxState?.success,
-        content: <Trans>Switch</Trans>,
+        content: <Trans>Swap</Trans>,
         handleClick: action,
       }}
       blocked={blocked}

diff --git a/src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx b/src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx
@@ -205,7 +205,7 @@ export const DebtSwitchModalContent = ({
         customAction={
           <Stack gap={3}>
             <Typography variant="description" color="text.primary">
-              <Trans>You&apos;ve successfully switched borrow position.</Trans>
+              <Trans>You&apos;ve successfully swapped your borrow position.</Trans>
             </Typography>
             <Stack direction="row" alignItems="center" justifyContent="center" gap={1}>
               <TokenIcon symbol={poolReserve.iconSymbol} sx={{ mx: 1 }} />

diff --git a/src/components/transactions/Swap/SwapActions.tsx b/src/components/transactions/Swap/SwapActions.tsx
@@ -115,14 +115,14 @@ export const SwapActions = ({
         })
       }
       requiresApproval={requiresApproval}
-      actionText={<Trans>Switch</Trans>}
+      actionText={<Trans>Swap</Trans>}
       actionInProgressText={<Trans>Switching</Trans>}
       sx={sx}
       fetchingData={loading}
       errorParams={{
         loading: false,
         disabled: blocked,
-        content: <Trans>Switch</Trans>,
+        content: <Trans>Swap</Trans>,
         handleClick: action,
       }}
       tryPermit

diff --git a/src/components/transactions/Swap/SwapModalContent.tsx b/src/components/transactions/Swap/SwapModalContent.tsx
@@ -170,7 +170,7 @@ export const SwapModalContent = ({
   if (supplyTxState.success)
     return (
       <TxSuccessView
-        action={<Trans>Switched</Trans>}
+        action={<Trans>Swapped</Trans>}
         amount={amountRef.current}
         symbol={poolReserve.symbol}
       />
@@ -279,7 +279,7 @@ export const SwapModalContent = ({
         usdValue={outputAmountUSD}
         symbol={targetReserve.symbol}
         assets={swapTargets}
-        inputTitle={<Trans>Switch to</Trans>}
+        inputTitle={<Trans>Swap to</Trans>}
         balanceText={<Trans>Supply balance</Trans>}
         disableInput
         loading={loadingSkeleton}

diff --git a/src/components/transactions/Switch/SwitchActions.tsx b/src/components/transactions/Switch/SwitchActions.tsx
@@ -305,12 +305,12 @@ export const SwitchActions = ({
       amount={inputAmount}
       handleApproval={() => approval()}
       requiresApproval={!blocked && requiresApproval}
-      actionText={<Trans>Switch</Trans>}
-      actionInProgressText={<Trans>Switching</Trans>}
+      actionText={<Trans>Swap</Trans>}
+      actionInProgressText={<Trans>Swapping</Trans>}
       errorParams={{
         loading: false,
         disabled: blocked || (!approvalTxState.success && requiresApproval),
-        content: <Trans>Switch</Trans>,
+        content: <Trans>Swap</Trans>,
         handleClick: action,
       }}
       fetchingData={loading}

diff --git a/src/components/transactions/Switch/SwitchModal.tsx b/src/components/transactions/Switch/SwitchModal.tsx
@@ -161,7 +161,7 @@ export const SwitchModal = () => {
       {!user ? (
         <Box sx={{ display: 'flex', flexDirection: 'column', mt: 4, alignItems: 'center' }}>
           <Typography sx={{ mb: 6, textAlign: 'center' }} color="text.secondary">
-            <Trans>Please connect your wallet to be able to switch your tokens.</Trans>
+            <Trans>Please connect your wallet to be able to swap your tokens.</Trans>
           </Typography>
           <ConnectWalletButton />
         </Box>

diff --git a/src/components/transactions/Switch/SwitchModalContent.tsx b/src/components/transactions/Switch/SwitchModalContent.tsx
@@ -215,7 +215,7 @@ export const SwitchModalContent = ({
 
   return (
     <>
-      <TxModalTitle title="Switch tokens" />
+      <TxModalTitle title="Swap tokens" />
       {isWrongNetwork.isWrongNetwork && !readOnlyModeAddress && (
         <ChangeNetworkWarning
           networkName={selectedNetworkConfig.name}
@@ -375,7 +375,7 @@ export const SwitchModalContent = ({
           ) : (
             <Box sx={{ display: 'flex', flexDirection: 'column', mt: 4, alignItems: 'center' }}>
               <Typography sx={{ mb: 6, textAlign: 'center' }} color="text.secondary">
-                <Trans>Please connect your wallet to be able to switch your tokens.</Trans>
+                <Trans>Please connect your wallet to be able to swap your tokens.</Trans>
               </Typography>
               <ConnectWalletButton />
             </Box>

diff --git a/src/components/transactions/Switch/SwitchTxSuccessView.tsx b/src/components/transactions/Switch/SwitchTxSuccessView.tsx
@@ -42,7 +42,7 @@ export const SwitchTxSuccessView = ({
         }}
       >
         <Typography>
-          <Trans>You&apos;ve successfully switched tokens.</Trans>
+          <Trans>You&apos;ve successfully swapped tokens.</Trans>
         </Typography>
         <Box
           sx={{

diff --git a/src/layouts/AppHeader.tsx b/src/layouts/AppHeader.tsx
@@ -312,7 +312,7 @@ export function AppHeader() {
             >
               {!smd && (
                 <Typography component="span" typography="subheader1">
-                  Switch tokens
+                  Swap tokens
                 </Typography>
               )}
               <SvgIcon fontSize="small">

diff --git a/src/locales/el/messages.js b/src/locales/el/messages.js
diff --git a/src/locales/en/messages.js b/src/locales/en/messages.js
diff --git a/src/locales/en/messages.po b/src/locales/en/messages.po
@@ -246,10 +246,6 @@ msgstr "Borrow {symbol}"
 msgid "Total supplied"
 msgstr "Total supplied"
 
-#: src/components/transactions/Swap/SwapModalContent.tsx
-msgid "Switched"
-msgstr "Switched"
-
 #: src/components/transactions/Withdraw/WithdrawAndSwitchModalContent.tsx
 #: src/components/transactions/Withdraw/WithdrawModalContent.tsx
 msgid "Remaining supply"
@@ -312,6 +308,11 @@ msgstr "View Transactions"
 msgid "MAX"
 msgstr "MAX"
 
+#: src/components/transactions/Switch/SwitchModal.tsx
+#: src/components/transactions/Switch/SwitchModalContent.tsx
+msgid "Please connect your wallet to be able to swap your tokens."
+msgstr "Please connect your wallet to be able to swap your tokens."
+
 #: src/layouts/AppFooter.tsx
 msgid "Terms"
 msgstr "Terms"
@@ -761,7 +762,6 @@ msgstr "Greek"
 
 #: src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
 #: src/components/transactions/Swap/SwapActions.tsx
-#: src/components/transactions/Switch/SwitchActions.tsx
 msgid "Switching"
 msgstr "Switching"
 
@@ -1072,6 +1072,10 @@ msgstr "Estimated compounding interest, including discount for Staking {0}AAVE i
 msgid "Unstaking {symbol}"
 msgstr "Unstaking {symbol}"
 
+#: src/components/transactions/Switch/SwitchActions.tsx
+msgid "Swapping"
+msgstr "Swapping"
+
 #: src/components/transactions/CollateralChange/CollateralChangeModalContent.tsx
 msgid "You can not use this currency as collateral"
 msgstr "You can not use this currency as collateral"
@@ -1233,19 +1237,7 @@ msgstr "Emode"
 msgid "Tip: Try increasing slippage or reduce input amount"
 msgstr "Tip: Try increasing slippage or reduce input amount"
 
-#: src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
-#: src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
-#: src/components/transactions/Swap/SwapActions.tsx
-#: src/components/transactions/Swap/SwapActions.tsx
 #: src/components/transactions/Swap/SwapModal.tsx
-#: src/components/transactions/Switch/SwitchActions.tsx
-#: src/components/transactions/Switch/SwitchActions.tsx
-#: src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx
-#: src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx
-#: src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx
-#: src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx
-#: src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx
-#: src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListMobileItem.tsx
 msgid "Switch"
 msgstr "Switch"
 
@@ -1305,6 +1297,10 @@ msgstr "Asset can be only used as collateral in isolation mode with limited borr
 msgid "View all"
 msgstr "View all"
 
+#: src/components/transactions/Swap/SwapModalContent.tsx
+msgid "Swap to"
+msgstr "Swap to"
+
 #: src/components/transactions/CollateralChange/CollateralChangeActions.tsx
 #: src/components/transactions/Faucet/FaucetActions.tsx
 msgid "Pending..."
@@ -1431,6 +1427,10 @@ msgstr "Fee"
 msgid "Liquidation threshold"
 msgstr "Liquidation threshold"
 
+#: src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx
+msgid "You've successfully swapped your borrow position."
+msgstr "You've successfully swapped your borrow position."
+
 #: src/components/infoTooltips/SpkAirdropTooltip.tsx
 msgid "This asset is eligible for SPK incentive program. Aave Labs does not guarantee the program and accepts no liability."
 msgstr "This asset is eligible for SPK incentive program. Aave Labs does not guarantee the program and accepts no liability."
@@ -1459,6 +1459,10 @@ msgstr "The Aave Balancer Pool Token (ABPT) is a liquidity pool token. You can r
 msgid "Withdrawing"
 msgstr "Withdrawing"
 
+#: src/components/transactions/Swap/SwapModalContent.tsx
+msgid "Swapped"
+msgstr "Swapped"
+
 #: pages/staking.staking.tsx
 msgid "Stake GHO"
 msgstr "Stake GHO"
@@ -1784,10 +1788,6 @@ msgstr "No results found. You can import a custom token with a contract address"
 msgid "To borrow you need to supply any asset to be used as collateral."
 msgstr "To borrow you need to supply any asset to be used as collateral."
 
-#: src/components/transactions/Switch/SwitchTxSuccessView.tsx
-msgid "You've successfully switched tokens."
-msgstr "You've successfully switched tokens."
-
 #: src/components/transactions/FlowCommons/Error.tsx
 msgid "Copy error text"
 msgstr "Copy error text"
@@ -2208,10 +2208,6 @@ msgstr "Get ABP Token"
 msgid "You switched to {0} rate"
 msgstr "You switched to {0} rate"
 
-#: src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx
-msgid "You've successfully switched borrow position."
-msgstr "You've successfully switched borrow position."
-
 #: src/components/incentives/IncentivesTooltipContent.tsx
 msgid "Net APR"
 msgstr "Net APR"
@@ -2747,11 +2743,6 @@ msgstr "Cooldown to unstake"
 msgid "User does not have outstanding variable rate debt on this reserve"
 msgstr "User does not have outstanding variable rate debt on this reserve"
 
-#: src/components/transactions/Switch/SwitchModal.tsx
-#: src/components/transactions/Switch/SwitchModalContent.tsx
-msgid "Please connect your wallet to be able to switch your tokens."
-msgstr "Please connect your wallet to be able to switch your tokens."
-
 #: src/modules/faucet/FaucetAssetsList.tsx
 msgid "Test Assets"
 msgstr "Test Assets"
@@ -2899,6 +2890,10 @@ msgstr "Collateral balance after repay"
 msgid "copy the error"
 msgstr "copy the error"
 
+#: src/components/transactions/Switch/SwitchTxSuccessView.tsx
+msgid "You've successfully swapped tokens."
+msgstr "You've successfully swapped tokens."
+
 #: src/components/ConnectWalletPaper.tsx
 #: src/components/ConnectWalletPaperStaking.tsx
 msgid "Please connect your wallet to see your supplies, borrowings, and open positions."
@@ -3109,7 +3104,6 @@ msgid "Your supplies"
 msgstr "Your supplies"
 
 #: src/components/transactions/DebtSwitch/DebtSwitchModalContent.tsx
-#: src/components/transactions/Swap/SwapModalContent.tsx
 msgid "Switch to"
 msgstr "Switch to"
 
@@ -3179,6 +3173,21 @@ msgstr "Insufficient collateral to cover new borrow position. Wallet must have b
 msgid "Restaked"
 msgstr "Restaked"
 
+#: src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
+#: src/components/transactions/DebtSwitch/DebtSwitchActions.tsx
+#: src/components/transactions/Swap/SwapActions.tsx
+#: src/components/transactions/Swap/SwapActions.tsx
+#: src/components/transactions/Switch/SwitchActions.tsx
+#: src/components/transactions/Switch/SwitchActions.tsx
+#: src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx
+#: src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx
+#: src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx
+#: src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx
+#: src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx
+#: src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListMobileItem.tsx
+msgid "Swap"
+msgstr "Swap"
+
 #: src/components/lists/ListWrapper.tsx
 msgid "Hide"
 msgstr "Hide"

diff --git a/src/locales/es/messages.js b/src/locales/es/messages.js
diff --git a/src/locales/fr/messages.js b/src/locales/fr/messages.js
diff --git a/src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx b/src/modules/dashboard/lists/BorrowedPositionsList/BorrowedPositionsListItem.tsx
@@ -147,7 +147,7 @@ const BorrowedPositionsListItemDesktop = ({
             onClick={onDetbSwitchClick}
             data-cy={`swapButton`}
           >
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button disabled={disableBorrow} variant="contained" onClick={onOpenBorrow}>
@@ -225,7 +225,7 @@ const BorrowedPositionsListItemMobile = ({
             onClick={onDetbSwitchClick}
             data-cy={`swapButton`}
           >
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button disabled={disableBorrow} variant="contained" onClick={onOpenBorrow} fullWidth>

diff --git a/src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx b/src/modules/dashboard/lists/BorrowedPositionsList/GhoBorrowedPositionsListItem.tsx
@@ -182,7 +182,7 @@ const GhoBorrowedPositionsListItemDesktop = ({
             onClick={onSwitchClick}
             data-cy={`swapButton`}
           >
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button disabled={borrowDisabled} variant="outlined" onClick={onBorrowClick}>
@@ -254,7 +254,7 @@ const GhoBorrowedPositionsListItemMobile = ({
       <Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', mt: 5 }}>
         {showSwitchButton ? (
           <Button disabled={disableSwitch} variant="contained" fullWidth onClick={onSwitchClick}>
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button disabled={borrowDisabled} variant="outlined" onClick={onBorrowClick} fullWidth>

diff --git a/src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx b/src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListItem.tsx
@@ -120,7 +120,7 @@ export const SuppliedPositionsListItem = ({
             }}
             data-cy={`swapButton`}
           >
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button

diff --git a/src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListMobileItem.tsx b/src/modules/dashboard/lists/SuppliedPositionsList/SuppliedPositionsListMobileItem.tsx
@@ -126,7 +126,7 @@ export const SuppliedPositionsListMobileItem = ({
             onClick={() => openSwap(underlyingAsset)}
             fullWidth
           >
-            <Trans>Switch</Trans>
+            <Trans>Swap</Trans>
           </Button>
         ) : (
           <Button

diff --git a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx
@@ -289,7 +289,7 @@ export const SupplyAssetsListItemDesktop = ({
             <SvgIcon fontSize="small">
               <SwitchHorizontalIcon />
             </SvgIcon>
-            <ListItemText>Switch</ListItemText>
+            <ListItemText>Swap</ListItemText>
           </MenuItem>
           <MenuItem
             sx={{ gap: 2 }}