fix: show dex related info only for dex transactions

superhero-com · Apr 15, 2024 · 8faa670 · 8faa670
1 parent e0ceb19
commit 8faa670
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/composables/transactionData.ts b/src/composables/transactionData.ts
@@ -196,7 +196,7 @@ export function useTransactionData({
         const functionName = camelCase(innerTx.value.function) as TxFunctionParsed;
         const functionResolver = getTransactionTokenInfoResolver(functionName);
 
-        if (functionResolver) {
+        if (functionResolver && isDex.value) {
           return functionResolver({ tx: outerTx.value } as ITransaction, protocolTokens)
             .tokens
             .map(({

diff --git a/src/popup/components/Modals/ConfirmTransactionSign.vue b/src/popup/components/Modals/ConfirmTransactionSign.vue
@@ -289,8 +289,8 @@ export default defineComponent({
       (): Partial<ITransaction> => ({ tx: popupProps.value?.tx as any }),
     );
 
-    const isSwap = computed(() => isTxFunctionDexSwap(txFunction.value));
-    const isPool = computed(() => isTxFunctionDexPool(txFunction.value));
+    const isSwap = computed(() => isDex.value && isTxFunctionDexSwap(txFunction.value));
+    const isPool = computed(() => isDex.value && isTxFunctionDexPool(txFunction.value));
     const isMaxSpent = computed(() => isTxFunctionDexMaxSpent(txFunction.value));
     const isMinReceived = computed(() => isTxFunctionDexMinReceived(txFunction.value));
     const txAeFee = computed(() => getAeFee(popupProps.value?.tx?.fee!));

diff --git a/src/protocols/aeternity/views/TransactionDetails.vue b/src/protocols/aeternity/views/TransactionDetails.vue
@@ -277,8 +277,8 @@ export default defineComponent({
       : 0);
     const tipUrl = computed(() => transaction.value ? getTransactionTipUrl(transaction.value) : '');
     const txFunction = computed(() => transaction.value?.tx?.function as TxFunctionRaw | undefined);
-    const isSwap = computed(() => isTxFunctionDexSwap(txFunction.value));
-    const isPool = computed(() => isTxFunctionDexPool(txFunction.value));
+    const isSwap = computed(() => isDex.value && isTxFunctionDexSwap(txFunction.value));
+    const isPool = computed(() => isDex.value && isTxFunctionDexPool(txFunction.value));
     const tipLink = computed(() => /^http[s]*:\/\//.test(tipUrl.value) ? tipUrl.value : `http://${tipUrl.value}`);
 
     const gasPrice = computed(() => (