Add native USDC balance to displayed account balance

But continue to only use "old" bridged USDC balance for sending and swapping limits.
nimiq · Oct 31, 2023 · 7fa585e · 7fa585e
1 parent cf70353
commit 7fa585e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/components/AccountBalance.vue b/src/components/AccountBalance.vue
@@ -41,7 +41,10 @@ export default defineComponent({
     setup(props, context) {
         const { accountBalance } = useAddressStore();
         const { accountBalance: btcAccountBalance } = useBtcAddressStore();
-        const { accountBalance: usdcAccountBalance } = useUsdcAddressStore();
+        const {
+            accountBalance: usdcAccountBalance,
+            nativeAccountBalance: nativeUsdcAccountBalance,
+        } = useUsdcAddressStore();
         const { currency: fiatCurrency, exchangeRates } = useFiatStore();
         const { config } = useConfig();
 
@@ -67,7 +70,7 @@ export default defineComponent({
 
             if (config.usdc.enabled) {
                 const usdcFiatAmount = usdcExchangeRate.value !== undefined
-                    ? (usdcAccountBalance.value / 1e6) * usdcExchangeRate.value
+                    ? ((usdcAccountBalance.value + nativeUsdcAccountBalance.value) / 1e6) * usdcExchangeRate.value
                     : undefined;
                 if (usdcFiatAmount === undefined) return undefined;
                 amount += usdcFiatAmount;

diff --git a/src/components/AccountMenuItem.vue b/src/components/AccountMenuItem.vue
@@ -109,6 +109,10 @@ export default defineComponent({
             ? usdcAddressState.addressInfos[polygonAddress.value]?.balance || 0
             : 0,
         );
+        const nativeUsdcAccountBalance = computed(() => polygonAddress.value
+            ? usdcAddressState.addressInfos[polygonAddress.value]?.nativeBalance || 0
+            : 0,
+        );
 
         // TODO: Dedupe double code with AccountBalance
         const { currency: fiatCurrency, exchangeRates } = useFiatStore();
@@ -131,7 +135,7 @@ export default defineComponent({
             }
             if (config.usdc.enabled) {
                 const usdcFiatAmount = usdcExchangeRate.value !== undefined
-                    ? (usdcAccountBalance.value / 1e6) * usdcExchangeRate.value
+                    ? ((usdcAccountBalance.value + nativeUsdcAccountBalance.value) / 1e6) * usdcExchangeRate.value
                     : undefined;
                 if (usdcFiatAmount === undefined) return undefined;
                 amount += usdcFiatAmount;

diff --git a/src/components/layouts/AddressOverview.vue b/src/components/layouts/AddressOverview.vue
@@ -82,7 +82,7 @@
                         <Amount v-if="activeCurrency === 'nim'" :amount="activeAddressInfo.balance" value-mask/>
                         <Amount v-if="activeCurrency === 'btc'" :amount="btcAccountBalance" currency="btc" value-mask/>
                         <Amount v-if="activeCurrency === 'usdc'"
-                            :amount="usdcAccountBalance" currency="usdc" value-mask/>
+                            :amount="usdcAccountBalance + nativeUsdcAccountBalance" currency="usdc" value-mask/>
                     </div>
                     <div class="flex-row">
                         <!-- We need to key the Copyable component, so that the tooltip disappears when
@@ -264,7 +264,11 @@ export default defineComponent({
         const { activeAccountId, activeCurrency } = useAccountStore();
         const { activeAddressInfo, activeAddress } = useAddressStore();
         const { accountBalance: btcAccountBalance } = useBtcAddressStore();
-        const { accountBalance: usdcAccountBalance, addressInfo: usdcAddressInfo } = useUsdcAddressStore();
+        const {
+            accountBalance: usdcAccountBalance,
+            nativeAccountBalance: nativeUsdcAccountBalance,
+            addressInfo: usdcAddressInfo,
+        } = useUsdcAddressStore();
         const { promoBoxVisible, setPromoBoxVisible } = useSwapsStore();
 
         const searchString = ref('');
@@ -360,6 +364,7 @@ export default defineComponent({
             hideUnclaimedCashlinkList,
             btcAccountBalance,
             usdcAccountBalance,
+            nativeUsdcAccountBalance,
             usdcAddressInfo,
             CryptoCurrency,
             promoBoxVisible,

diff --git a/src/stores/UsdcAddress.ts b/src/stores/UsdcAddress.ts
@@ -36,6 +36,11 @@ export const useUsdcAddressStore = createStore({
             if (!ai || ai.balance === null) return 0;
             return ai.balance;
         },
+        nativeAccountBalance: (state, { addressInfo }) => {
+            const ai = addressInfo.value as UsdcAddressInfo | undefined;
+            if (!ai || ai.nativeBalance === null) return 0;
+            return ai.nativeBalance;
+        },
     },
     actions: {
         addAddressInfo(addressInfo: UsdcAddressInfo) {