Fix native usdc balance not being taken into account in several places

nimiq · Mar 28, 2024 · 625fd7e · 625fd7e
1 parent 1ea4260
commit 625fd7e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 23 deletions.
diff --git a/src/components/AddressList.vue b/src/components/AddressList.vue
@@ -81,7 +81,11 @@ export default defineComponent({
     setup(props, context) {
         const { addressInfos, activeAddress, selectAddress } = useAddressStore();
         const { availableExternalAddresses, accountBalance: btcAccountBalance } = useBtcAddressStore();
-        const { addressInfo: usdcAddressInfo, accountBalance: usdcAccountBalance } = useUsdcAddressStore();
+        const {
+            addressInfo: usdcAddressInfo,
+            accountBalance: usdcAccountBalance,
+            nativeAccountBalance: nativeUsdcAccountBalance,
+        } = useUsdcAddressStore();
         const { activeCurrency, setActiveCurrency } = useAccountStore();
         const { state: network$ } = useNetworkStore();
         const { amountsHidden } = useSettingsStore();
@@ -177,7 +181,7 @@ export default defineComponent({
         const usdcInfo = computed(() => ({
             address: usdcAddressInfo.value?.address || 'usdc',
             label: context.root.$t('USD Coin') as string,
-            balance: usdcAccountBalance.value,
+            balance: usdcAccountBalance.value + nativeUsdcAccountBalance.value,
             type: CryptoCurrency.USDC,
         }));
 

diff --git a/src/components/layouts/AccountOverview.vue b/src/components/layouts/AccountOverview.vue
@@ -79,7 +79,10 @@
                     preferredPosition="top"
                     v-if="activeAccountInfo.type !== AccountType.LEDGER
                         && hasUsdcAddresses && $config.usdc.enabled
-                        && (nimAccountBalance > 0 || usdcAccountBalance > 0)"
+                        && (
+                            nimAccountBalance > 0
+                            || nativeUsdcAccountBalance > 0 /* only swap with native USDC supported, not bridged */
+                        )"
                     noFocus>
                     <button class="reset" slot="trigger"
                         @pointerdown="onSwapButtonPointerDown($event, 'NIM-USDC_MATIC')"
@@ -130,7 +133,10 @@
                     v-if="activeAccountInfo.type !== AccountType.LEDGER
                         && hasBitcoinAddresses && hasUsdcAddresses
                         && $config.enableBitcoin && $config.usdc.enabled
-                        && (btcAccountBalance > 0 || usdcAccountBalance > 0)"
+                        && (
+                            btcAccountBalance > 0
+                            || nativeUsdcAccountBalance > 0 /* only swap with native USDC supported, not bridged */
+                        )"
                     noFocus>
                     <button class="reset" slot="trigger"
                         @pointerdown="onSwapButtonPointerDown($event, 'BTC-USDC_MATIC')"
@@ -157,7 +163,7 @@
                     <div class="usdc-account-item reset flex-column" @click="selectUsdc">
                         <div class="usdc-account-item-name flex-row"><UsdcIcon/>{{ $t('USD Coin') }}</div>
                         <div class="balances" v-if="hasUsdcAddresses">
-                            <template v-if="usdcAccountBalance !== null">
+                            <template v-if="usdcAccountBalance !== null && nativeUsdcAccountBalance !== null">
                                 <div class="flex-row">
                                     <AlertTriangleIcon v-if="usdcConsensus === 'connecting'" />
                                     <Amount
@@ -289,12 +295,12 @@ export default defineComponent({
             hasBitcoinAddresses,
             hasUsdcAddresses,
         } = useAccountStore();
+        const { accountBalance: nimAccountBalance } = useAddressStore();
         const { accountBalance: btcAccountBalance } = useBtcAddressStore();
         const {
             accountBalance: usdcAccountBalance,
             nativeAccountBalance: nativeUsdcAccountBalance,
         } = useUsdcAddressStore();
-        const { accountBalance: nimAccountBalance } = useAddressStore();
         const { config } = useConfig();
 
         const isLegacyAccount = computed(() => (activeAccountInfo.value || false)
@@ -475,10 +481,10 @@ export default defineComponent({
             addAddress,
             activeAccountId,
             onAddressSelected,
+            nimAccountBalance,
             btcAccountBalance,
             usdcAccountBalance,
             nativeUsdcAccountBalance,
-            nimAccountBalance,
             showFullLegacyAccountNotice,
             showModalLegacyAccountNotice,
             selectBitcoin,

diff --git a/src/components/layouts/AddressOverview.vue b/src/components/layouts/AddressOverview.vue
@@ -133,7 +133,7 @@
                         @click="$router.push(`/send/${activeCurrency}`)" @mousedown.prevent
                         :disabled="(activeCurrency === 'nim' && (!activeAddressInfo || !activeAddressInfo.balance))
                             || (activeCurrency === 'btc' && !btcAccountBalance)
-                            || (activeCurrency === 'usdc' && !nativeUsdcAccountBalance)"
+                            || (activeCurrency === 'usdc' && !nativeUsdcAccountBalance /* can only send native usdc */)"
                     >
                         <ArrowRightSmallIcon />{{ $t('Send') }}
                     </button>

diff --git a/src/components/layouts/Sidebar.vue b/src/components/layouts/Sidebar.vue
@@ -250,9 +250,11 @@ export default defineComponent({
             ...(config.usdc.enabled && hasUsdcAddresses.value ? [CryptoCurrency.USDC] : []),
         ]);
 
-        const hasBalance = computed(() => [useAddressStore, useBtcAddressStore, useUsdcAddressStore].some((useStore) =>
-            !!useStore().accountBalance.value,
-        ));
+        const hasBalance = computed(() => [useAddressStore, useBtcAddressStore, useUsdcAddressStore].some((use) => {
+            const store = use();
+            return !!(store.accountBalance.value
+              || ('nativeAccountBalance' in store && store.nativeAccountBalance.value));
+        }));
 
         const { activeSwap } = useSwapsStore();
         const hasActiveSwap = computed(() => activeSwap.value !== null);

diff --git a/src/components/swap/SwapModal.vue b/src/components/swap/SwapModal.vue
@@ -1062,7 +1062,7 @@ export default defineComponent({
             switch (asset) { // eslint-disable-line default-case
                 case SwapAsset.NIM: return activeAddressInfo.value?.balance ?? 0;
                 case SwapAsset.BTC: return accountBtcBalance.value;
-                case SwapAsset.USDC: return 0;
+                case SwapAsset.USDC: return 0; // not supported for swapping
                 case SwapAsset.USDC_MATIC: return accountUsdcBalance.value;
                 case SwapAsset.EUR: return 0;
             }

diff --git a/src/i18n/en.po b/src/i18n/en.po
@@ -191,8 +191,8 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: src/components/layouts/AccountOverview.vue:124
-#: src/components/layouts/AccountOverview.vue:182
+#: src/components/layouts/AccountOverview.vue:127
+#: src/components/layouts/AccountOverview.vue:188
 msgid "Activate"
 msgstr ""
 
@@ -269,7 +269,7 @@ msgstr ""
 msgid "All countries"
 msgstr ""
 
-#: src/components/layouts/AccountOverview.vue:220
+#: src/components/layouts/AccountOverview.vue:226
 #: src/components/LegacyAccountNotice.vue:37
 msgid "All new features are exclusive to new accounts. Upgrade now, it only takes seconds."
 msgstr ""
@@ -387,8 +387,8 @@ msgstr ""
 msgid "BIC works, too."
 msgstr ""
 
-#: src/components/AddressList.vue:172
-#: src/components/layouts/AccountOverview.vue:105
+#: src/components/AddressList.vue:176
+#: src/components/layouts/AccountOverview.vue:108
 #: src/components/layouts/AddressOverview.vue:80
 #: src/components/layouts/Settings.vue:119
 #: src/components/LegacyAccountNotice.vue:21
@@ -2122,7 +2122,7 @@ msgstr ""
 msgid "Swap"
 msgstr ""
 
-#: src/components/layouts/AccountOverview.vue:143
+#: src/components/layouts/AccountOverview.vue:149
 msgid "Swap BTC {arrowIcon} USDC"
 msgstr ""
 
@@ -2158,7 +2158,7 @@ msgstr ""
 msgid "Swap NIM {arrowIcon} BTC"
 msgstr ""
 
-#: src/components/layouts/AccountOverview.vue:92
+#: src/components/layouts/AccountOverview.vue:95
 msgid "Swap NIM {arrowIcon} USDC"
 msgstr ""
 
@@ -2476,8 +2476,8 @@ msgstr ""
 msgid "Update now"
 msgstr ""
 
-#: src/components/AddressList.vue:179
-#: src/components/layouts/AccountOverview.vue:158
+#: src/components/AddressList.vue:183
+#: src/components/layouts/AccountOverview.vue:164
 #: src/components/layouts/AddressOverview.vue:81
 #: src/components/UsdcAddressInfo.vue:12
 #: src/composables/useBtcTransactionInfo.ts:124
@@ -2578,7 +2578,7 @@ msgstr ""
 msgid "You can receive more free NIM in {waitTime} hours."
 msgstr ""
 
-#: src/components/layouts/Sidebar.vue:274
+#: src/components/layouts/Sidebar.vue:276
 msgid ""
 "You can sell NIM\n"
 "- in the Wallet by swapping NIM to BTC or USDC first, which can then be sold.\n"

diff --git a/src/stores/UsdcAddress.ts b/src/stores/UsdcAddress.ts
@@ -23,7 +23,7 @@ export const useUsdcAddressStore = createStore({
             const { activeAccountInfo } = useAccountStore();
             if (!activeAccountInfo.value?.polygonAddresses?.length) return undefined;
 
-            // TODO: Subtract pending outgoing balance from addressInfo.balance
+            // TODO: Subtract pending outgoing balance from addressInfo.balance / nativeBalance
             // const { pendingTransactionsBySender } = useUsdcTransactionsStore();
 
             // Only supports one USDC address per account for now