Enable transfer for coins

thxprotocol · Jul 19, 2024 · e5b5bf9 · e5b5bf9
1 parent 9f6cd93
commit e5b5bf9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/apps/api/src/app/services/ERC20Service.ts b/apps/api/src/app/services/ERC20Service.ts
@@ -20,11 +20,16 @@ import {
 import TransactionService from './TransactionService';
 import PoolService from './PoolService';
 import { fromWei } from 'web3-utils';
-import { NODE_ENV } from '../config/secrets';
 
 async function decorate(token: ERC20TokenDocument, wallet: WalletDocument) {
     const erc20 = await getById(token.erc20Id);
-    if (!erc20 || erc20.chainId !== wallet.chainId) return;
+    if (!erc20) {
+        throw new Error(`ERC20 not found for ${token.erc20Id}`);
+    }
+
+    if (erc20.chainId !== wallet.chainId) {
+        throw new Error(`ERC20 chain ${erc20.chainId} not equal walllet chain ${wallet.chainId}`);
+    }
 
     const walletBalanceInWei = await erc20.contract.methods.balanceOf(wallet.address).call();
     const walletBalance = fromWei(walletBalanceInWei, 'ether');

diff --git a/apps/app/src/components/card/BaseCardERC20.vue b/apps/app/src/components/card/BaseCardERC20.vue
@@ -14,7 +14,9 @@
         </template>
 
         <template #dropdown-items>
-            <b-dropdown-item disabled @click="isModalTransferShown = true"> Transfer </b-dropdown-item>
+            <b-dropdown-item :disabled="isDisabledTransfer" @click="isModalTransferShown = true">
+                Transfer
+            </b-dropdown-item>
             <b-dropdown-item :href="blockExplorerURL"> Block Explorer </b-dropdown-item>
             <BaseModalERC20Transfer
                 :id="`modalERC20Transfer${token.erc20._id}`"
@@ -36,7 +38,7 @@ import { useWalletStore } from '../../stores/Wallet';
 import { useAccountStore } from '../../stores/Account';
 import { toast } from '../../utils/toast';
 import { fromWei } from 'web3-utils';
-import { RewardVariant } from '@thxnetwork/common/enums';
+import { RewardVariant, WalletVariant } from '@thxnetwork/common/enums';
 import { chainList } from '@thxnetwork/app/utils/chains';
 
 export default defineComponent({
@@ -69,6 +71,9 @@ export default defineComponent({
 
             return chainList[chainId].blockExplorer + '/token/' + this.token.erc20.address + '?a=' + wallet.address;
         },
+        isDisabledTransfer() {
+            return this.walletStore.wallet?.variant !== WalletVariant.Safe;
+        },
     },
     methods: {
         onToastClose() {

diff --git a/apps/app/src/components/card/BaseCardPayment.vue b/apps/app/src/components/card/BaseCardPayment.vue
@@ -29,8 +29,8 @@
                     </template>
                     <slot name="dropdown-items"></slot>
                     <b-dropdown-divider />
-                    <b-dropdown-text v-if="createdAt" class="text-end small text-opaque">
-                        {{ format(new Date(createdAt), 'MMMM do hh:mm') }}
+                    <b-dropdown-text v-if="createdAt" class="text-end small text-opaque py-0">
+                        {{ format(new Date(createdAt), 'MM do hh:mm') }}
                     </b-dropdown-text>
                 </b-dropdown>
             </div>