refactor: rename tokenSwaps to tokenSales

superhero-com · Oct 31, 2024 · 4a7d815 · 4a7d815
1 parent 5de6021
commit 4a7d815
Show file tree

Hide file tree

Showing 18 changed files with 133 additions and 133 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
 UNFINISHED_FEATURES=true
 ETHERSCAN_API_KEY=
 WALLET_CONNECT_PROJECT_ID=
-TOKEN_SWAP_URL_TESTNET=
-TOKEN_SWAP_URL_MAINNET=
+TOKEN_SALES_URL_MAINNET=
+TOKEN_SALES_URL_TESTNET=
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,8 +6,8 @@ jobs:
     env:
       APP_NAME: wallet
       WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
-      TOKEN_SWAP_URL_MAINNET: ${{ secrets.TOKEN_SWAP_URL_MAINNET }}
-      TOKEN_SWAP_URL_TESTNET: ${{ secrets.TOKEN_SWAP_URL_TESTNET }}
+      TOKEN_SALES_URL_MAINNET: ${{ secrets.TOKEN_SALES_URL_MAINNET }}
+      TOKEN_SALES_URL_TESTNET: ${{ secrets.TOKEN_SALES_URL_TESTNET }}
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,8 +5,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       APP_NAME: wallet
-      TOKEN_SWAP_URL_MAINNET: ${{ secrets.TOKEN_SWAP_URL_MAINNET }}
-      TOKEN_SWAP_URL_TESTNET: ${{ secrets.TOKEN_SWAP_URL_TESTNET }}
+      TOKEN_SALES_URL_MAINNET: ${{ secrets.TOKEN_SALES_URL_MAINNET }}
+      TOKEN_SALES_URL_TESTNET: ${{ secrets.TOKEN_SALES_URL_TESTNET }}
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/src/composables/transactionData.ts b/src/composables/transactionData.ts
@@ -24,7 +24,7 @@ import {
   TX_FUNCTIONS,
   TX_FUNCTIONS_MULTISIG,
   TX_FUNCTIONS_TYPE_DEX,
-  TX_FUNCTIONS_TOKEN_SWAP,
+  TX_FUNCTIONS_TOKEN_SALE,
 } from '@/protocols/aeternity/config';
 import {
   aettosToAe,
@@ -40,7 +40,7 @@ import {
   isTxDex,
 } from '@/protocols/aeternity/helpers';
 import { useFungibleTokens } from '@/composables/fungibleTokens';
-import { useAeTokenSwaps } from '@/protocols/aeternity/composables/aeTokenSwaps';
+import { useAeTokenSales } from '@/protocols/aeternity/composables/aeTokenSales';
 import { useAccounts } from './accounts';
 import { useAeSdk } from './aeSdk';
 
@@ -68,9 +68,9 @@ export function useTransactionData({
   const { getProtocolAvailableTokens, getTxAmountTotal, getTxAssetSymbol } = useFungibleTokens();
   const {
     tokenContractAddresses,
-    tokenSwapAddresses,
-    tokenSwapAddressToTokenContractAddress,
-  } = useAeTokenSwaps();
+    tokenSaleAddresses,
+    tokenSaleAddressToTokenContractAddress,
+  } = useAeTokenSales();
 
   const protocol = computed(() => transaction.value?.protocol || PROTOCOLS.aeternity);
   const outerTx = computed(() => transaction.value?.tx);
@@ -116,24 +116,24 @@ export function useTransactionData({
     ),
   );
 
-  const isTokenSwap = computed(
+  const isTokenSale = computed(
     (): boolean => [
       ...tokenContractAddresses.value,
-      ...tokenSwapAddresses.value,
+      ...tokenSaleAddresses.value,
     ].some((address) => address === innerTx.value?.contractId),
   );
 
-  const isTokenSwapBuy = computed(
+  const isTokenSaleBuy = computed(
     (): boolean => (
-      isTokenSwap.value
-      && includes(TX_FUNCTIONS_TOKEN_SWAP.buy, txFunctionRaw.value)
+      isTokenSale.value
+      && includes(TX_FUNCTIONS_TOKEN_SALE.buy, txFunctionRaw.value)
     ),
   );
 
-  const isTokenSwapSell = computed(
+  const isTokenSaleSell = computed(
     (): boolean => (
-      isTokenSwap.value
-      && includes(TX_FUNCTIONS_TOKEN_SWAP.sell, txFunctionRaw.value)
+      isTokenSale.value
+      && includes(TX_FUNCTIONS_TOKEN_SALE.sell, txFunctionRaw.value)
     ),
   );
 
@@ -255,7 +255,7 @@ export function useTransactionData({
     if (protocol.value === PROTOCOLS.aeternity) {
       // AE DEX and wrapped AE (WAE)
       if (
-        (isDex.value || isTokenSwap.value)
+        (isDex.value || isTokenSale.value)
         && txFunctionParsed.value
         && (!isDexAllowance.value || showDetailedAllowanceInfo)
       ) {
@@ -264,7 +264,7 @@ export function useTransactionData({
           return functionResolver(
             { tx: outerTx.value } as ITransaction,
             protocolTokens,
-            tokenSwapAddressToTokenContractAddress,
+            tokenSaleAddressToTokenContractAddress,
           )
             .tokens
             .map(({
@@ -343,9 +343,9 @@ export function useTransactionData({
     isAex9,
     isErrorTransaction,
 
-    isTokenSwap,
-    isTokenSwapBuy,
-    isTokenSwapSell,
+    isTokenSale,
+    isTokenSaleBuy,
+    isTokenSaleSell,
 
     isDex,
     isDexAllowance,

diff --git a/src/popup/components/Modals/ConfirmTransactionSign.vue b/src/popup/components/Modals/ConfirmTransactionSign.vue
@@ -51,7 +51,7 @@
       <!-- Aeternity DEX & Tokaen transactions any ETH transactions involving multiple assets -->
       <template
         v-if="(
-          (isDex || isTokenSwap) && tokenList.length
+          (isDex || isTokenSale) && tokenList.length
           || protocol === PROTOCOLS.ethereum && tokenList.length > 1
         )"
       >
@@ -61,7 +61,7 @@
           :token="token"
           :tokens="token.tokens || null"
           :label="getLabels(token, idx)"
-          :hide-amount="isDexSwap || isTokenSwap"
+          :hide-amount="isDexSwap || isTokenSale"
           :protocol="protocol"
         />
       </template>
@@ -78,7 +78,7 @@
         </DetailsItem>
 
         <DetailsItem
-          v-if="isDexSwap || isTokenSwap"
+          v-if="isDexSwap || isTokenSale"
           :label="swapDirectionTranslation"
         >
           <TokenAmount
@@ -137,7 +137,7 @@
         >
           <TokenAmount
             :amount="executionCost || amountTotal"
-            :symbol="isTokenSwap ? undefined : tokenSymbol"
+            :symbol="isTokenSale ? undefined : tokenSymbol"
             :hide-fiat="isAex9"
             :protocol="protocol"
             high-precision
@@ -301,7 +301,7 @@ import { decodeTxData } from '@/protocols/ethereum/helpers';
 import { ProtocolAdapterFactory } from '@/lib/ProtocolAdapterFactory';
 
 import type { EthDecodedCallData } from '@/protocols/ethereum/types';
-import { useAeTokenSwaps } from '@/protocols/aeternity/composables/aeTokenSwaps';
+import { useAeTokenSales } from '@/protocols/aeternity/composables/aeTokenSales';
 import { type SignAirGapTransactionResolvedVal } from './SignAirGapTransaction.vue';
 
 import Modal from '../Modal.vue';
@@ -361,7 +361,7 @@ export default defineComponent({
     const { popupProps, setPopupProps } = usePopupProps();
     const { getProtocolAvailableTokens, getTxAssetSymbol } = useFungibleTokens();
     const { openModal } = useModals();
-    const { areTokenSwapsReady, tokenSwapAddressToTokenContractAddress } = useAeTokenSwaps();
+    const { areTokenSalesReady, tokenSaleAddressToTokenContractAddress } = useAeTokenSales();
 
     const protocol = popupProps.value?.protocol || PROTOCOLS.aeternity;
     const adapter = ProtocolAdapterFactory.getAdapter(protocol);
@@ -394,7 +394,7 @@ export default defineComponent({
       isDexMinReceived,
       isDexPool,
       isDexSwap,
-      isTokenSwap,
+      isTokenSale,
       txFunctionParsed,
       transactionAssets,
     } = useTransactionData({
@@ -479,23 +479,23 @@ export default defineComponent({
       : undefined);
 
     async function getTokens(txParams: ITx): Promise<ITokenResolved[]> {
-      if (!isDex.value && !isDexAllowance.value && !isTokenSwap.value) {
+      if (!isDex.value && !isDexAllowance.value && !isTokenSale.value) {
         return [singleToken.value];
       }
       const resolver = getTransactionTokenInfoResolver(txFunctionParsed.value!);
       if (!resolver) {
         return [];
       }
-      if (protocol === PROTOCOLS.aeternity && isTokenSwap.value) {
-        // Wait until token swap tokens are resolved
-        await watchUntilTruthy(areTokenSwapsReady);
+      if (protocol === PROTOCOLS.aeternity && isTokenSale.value) {
+        // Wait until token sale tokens are resolved
+        await watchUntilTruthy(areTokenSalesReady);
       }
       const tokens = resolver(
         { tx: { ...txParams, ...popupProps.value?.tx } } as ITransaction,
         getProtocolAvailableTokens(PROTOCOLS.aeternity),
-        tokenSwapAddressToTokenContractAddress,
+        tokenSaleAddressToTokenContractAddress,
       )?.tokens;
-      if (!(isDexPool.value || isTokenSwap.value)) {
+      if (!(isDexPool.value || isTokenSale.value)) {
         return tokens;
       }
       if (isDexLiquidityAdd.value) {
@@ -703,7 +703,7 @@ export default defineComponent({
       isDexMaxSpent,
       isDexMinReceived,
       isDexSwap,
-      isTokenSwap,
+      isTokenSale,
       isHash,
       loading,
       nameAeFee,

diff --git a/src/popup/components/SwapRates.vue b/src/popup/components/SwapRates.vue
@@ -46,7 +46,7 @@ import type { ITransaction } from '@/types';
 import { PROTOCOLS } from '@/constants';
 import { getTransactionTokenInfoResolver } from '@/protocols/aeternity/helpers';
 import { useFungibleTokens, useTransactionData } from '@/composables';
-import { useAeTokenSwaps } from '@/protocols/aeternity/composables/aeTokenSwaps';
+import { useAeTokenSales } from '@/protocols/aeternity/composables/aeTokenSales';
 
 import DetailsItem from './DetailsItem.vue';
 import Tokens from './Tokens.vue';
@@ -63,14 +63,14 @@ export default defineComponent({
   },
   setup(props) {
     const { getProtocolAvailableTokens } = useFungibleTokens();
-    const { tokenSwapAddressToTokenContractAddress } = useAeTokenSwaps();
+    const { tokenSaleAddressToTokenContractAddress } = useAeTokenSales();
 
-    const { isDexSwap, txFunctionParsed, isTokenSwap } = useTransactionData({
+    const { isDexSwap, txFunctionParsed, isTokenSale } = useTransactionData({
       transaction: toRef(() => props.transaction),
     });
 
     const rates = computed(() => {
-      if (!isDexSwap.value || !isTokenSwap.value || !txFunctionParsed.value) {
+      if (!isDexSwap.value || !isTokenSale.value || !txFunctionParsed.value) {
         return [];
       }
 
@@ -82,7 +82,7 @@ export default defineComponent({
       const { tokens } = resolver(
         props.transaction,
         getProtocolAvailableTokens(PROTOCOLS.aeternity),
-        tokenSwapAddressToTokenContractAddress,
+        tokenSaleAddressToTokenContractAddress,
       );
 
       if (tokens?.length <= 1) {

diff --git a/src/popup/components/TransactionLabel.vue b/src/popup/components/TransactionLabel.vue
@@ -121,8 +121,8 @@ export default defineComponent({
       isDexAllowance,
       isDexLiquidityAdd,
       isDexLiquidityRemove,
-      isTokenSwapBuy,
-      isTokenSwapSell,
+      isTokenSaleBuy,
+      isTokenSaleSell,
       isErrorTransaction,
       isTip,
       txTypeListLabel,
@@ -167,10 +167,10 @@ export default defineComponent({
       } else if (isDex.value) {
         text = t('common.swap');
         hasComma = true;
-      } else if (isTokenSwapBuy.value) {
-        text = t('transaction.tokenSwap.bought');
-      } else if (isTokenSwapSell.value) {
-        text = t('transaction.tokenSwap.sold');
+      } else if (isTokenSaleBuy.value) {
+        text = t('transaction.tokenSale.bought');
+      } else if (isTokenSaleSell.value) {
+        text = t('transaction.tokenSale.sold');
       } else if (isTip.value && props.transaction.claim) {
         text = t('transaction.listType.tipReceived');
       } else if (isTip.value) {

diff --git a/src/popup/components/TransactionTagList.vue b/src/popup/components/TransactionTagList.vue
@@ -59,9 +59,9 @@ export default defineComponent({
       isDex,
       isDexPool,
       isDexAllowance,
-      isTokenSwap,
-      isTokenSwapBuy,
-      isTokenSwapSell,
+      isTokenSale,
+      isTokenSaleBuy,
+      isTokenSaleSell,
     } = useTransactionData({
       transaction: toRef(() => props.transaction),
     });
@@ -119,13 +119,13 @@ export default defineComponent({
             ? t('transaction.dexType.pool')
             : t('common.swap'),
         );
-      } else if (isTokenSwap.value) {
+      } else if (isTokenSale.value) {
         arr.push(
-          t('transaction.tokenSwap.tag'),
-          (isTokenSwapBuy.value)
+          t('transaction.tokenSale.tag'),
+          (isTokenSaleBuy.value)
             ? t('common.buy')
             : '',
-          (isTokenSwapSell.value)
+          (isTokenSaleSell.value)
             ? t('common.sell')
             : '',
         );

diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json
@@ -580,8 +580,8 @@
       "abort": "Failed",
       "revert": "Reverted"
     },
-    "tokenSwap": {
-      "tag": "token swap",
+    "tokenSale": {
+      "tag": "token sale",
       "bought": "Bought",
       "sold": "Sold"
     }
@@ -839,7 +839,7 @@
       "pooled": "Pooled",
       "daoBalance": "Dao balance",
       "ownerAddress": "Dao address",
-      "swapAddress": "Swap address",
+      "saleAddress": "Sale address",
       "creatorAddress": "Creator address"
     },
     "more": {