Merge pull request #713 from secretkeylabs/vic/api-core

Update core for API updates for native segwit

package.json

@@ -45,7 +45,7 @@
     "@sats-connect/core": "0.3.0",
     "@scure/base": "^1.1.9",
     "@scure/btc-signer": "1.2.1",
-    "@secretkeylabs/xverse-core": "26.0.0",
+    "@secretkeylabs/xverse-core": "27.0.0",
     "@stacks/connect": "7.4.1",
     "@stacks/stacks-blockchain-api-types": "6.1.1",
     "@stacks/transactions": "6.16.1",

src/app/components/confirmStxTransactionComponent/index.tsx

@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';

src/app/components/ledgerSteps/index.tsx

@@ -1,4 +1,4 @@
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import TransportFactory from '@ledgerhq/hw-transport-webusb';
 import { type Transport } from '@secretkeylabs/xverse-core';
 import Button from '@ui-library/button';

src/app/components/messageSigning/index.tsx

@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ConfirmScreen from '@components/confirmScreen';
 import InfoContainer from '@components/infoContainer';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';

src/app/hooks/queries/useSelectedAccountBtcBalance.tsx

@@ -4,18 +4,24 @@ import BigNumber from 'bignumber.js';
 
 export default function useSelectedAccountBtcBalance() {
   const selectedAccount = useSelectedAccount();
-  const { data: nativeBalance, isLoading: nativeLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.native?.address ?? '',
-  );
-  const { data: nestedBalance, isLoading: nestedLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.nested?.address ?? '',
-  );
-  const { data: taprootBalance, isLoading: taprootLoading } = useBtcAddressBalance(
-    selectedAccount.btcAddresses.taproot.address ?? '',
-  );
+  const {
+    data: nativeBalance,
+    isLoading: nativeLoading,
+    isRefetching: nativeRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.native?.address ?? '');
+  const {
+    data: nestedBalance,
+    isLoading: nestedLoading,
+    isRefetching: nestedRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.nested?.address ?? '');
+  const {
+    data: taprootBalance,
+    isLoading: taprootLoading,
+    isRefetching: taprootRefetching,
+  } = useBtcAddressBalance(selectedAccount.btcAddresses.taproot.address ?? '');
 
   if (nativeLoading || nestedLoading || taprootLoading) {
-    return { isLoading: true };
+    return { isLoading: true, isRefetching: false };
   }
 
   const confirmedBalance = BigNumber(nativeBalance?.confirmedBalance ?? 0)
@@ -35,5 +41,6 @@ export default function useSelectedAccountBtcBalance() {
     nestedBalance,
     taprootBalance,
     isLoading: false,
+    isRefetching: nativeRefetching || nestedRefetching || taprootRefetching,
   };
 }

src/app/hooks/useWalletReducer.ts

@@ -1,6 +1,7 @@
 import getSelectedAccount from '@common/utils/getSelectedAccount';
 import { getDeviceAccountIndex } from '@common/utils/ledger';
 import { dispatchEventAuthorizedConnectedClients } from '@common/utils/messages/extensionToContentScript/dispatchEvent';
+import { delay } from '@common/utils/promises';
 import { makeAccountResourceId } from '@components/permissionsManager/resources';
 import type { Permission } from '@components/permissionsManager/schemas';
 import useNetworkSelector from '@hooks/useNetwork';
@@ -183,11 +184,16 @@ const useWalletReducer = () => {
       newSoftwareAccountList.push(newAccount);
 
       if (newSoftwareAccountList.length >= currentAccounts.length) {
+        // we've regenerated the existing accounts, so we can update the store before continuing
         dispatch(updateSoftwareAccountsAction([...newSoftwareAccountList]));
 
         if (options?.accountLoadCallback) {
           await options.accountLoadCallback([...newSoftwareAccountList]);
         }
+
+        // since we've already loaded the existing accounts, we can now check for new accounts, but with a small delay
+        // to not overload the backends
+        await delay(100);
       }
 
       newAccountResponse = await walletAccountsGenerator.next();

src/app/screens/connect/authenticationRequest/index.tsx

@@ -3,7 +3,7 @@ import stxIcon from '@assets/img/dashboard/stx_icon.svg';
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
 import { MESSAGE_SOURCE } from '@common/types/message-types';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';

src/app/screens/home/balanceCard/index.tsx

@@ -80,7 +80,8 @@ function BalanceCard(props: BalanceCardProps) {
   const dispatch = useDispatch();
   const { fiatCurrency, hideStx, accountBalances, balanceHidden } = useWalletSelector();
   const { confirmedBalance: btcBalance, isLoading: btcBalanceLoading } =
-    useSelectedAccountBtcBalance();  const { data: stxData } = useStxWalletData();
+    useSelectedAccountBtcBalance();
+  const { data: stxData } = useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();
   const { setAccountBalance } = useAccountBalance();
   const { isLoading, isRefetching } = props;

src/app/screens/home/index.tsx

@@ -17,8 +17,8 @@ import {
   useVisibleSip10FungibleTokens,
 } from '@hooks/queries/stx/useGetSip10FungibleTokens';
 import useAppConfig from '@hooks/queries/useAppConfig';
-import useBtcWalletData from '@hooks/queries/useBtcWalletData';
 import useFeeMultipliers from '@hooks/queries/useFeeMultipliers';
+import useSelectedAccountBtcBalance from '@hooks/queries/useSelectedAccountBtcBalance';
 import useSpamTokens from '@hooks/queries/useSpamTokens';
 import useStxWalletData from '@hooks/queries/useStxWalletData';
 import useSupportedCoinRates from '@hooks/queries/useSupportedCoinRates';
@@ -93,8 +93,8 @@ function Home() {
   const [openReceiveModal, setOpenReceiveModal] = useState(false);
   const [openSendModal, setOpenSendModal] = useState(false);
   const [openBuyModal, setOpenBuyModal] = useState(false);
-  const { isInitialLoading: loadingBtcWalletData, isRefetching: refetchingBtcWalletData } =
-    useBtcWalletData();
+  const { isLoading: loadingBtcWalletData, isRefetching: refetchingBtcWalletData } =
+    useSelectedAccountBtcBalance();
   const { isInitialLoading: loadingStxWalletData, isRefetching: refetchingStxWalletData } =
     useStxWalletData();
   const { btcFiatRate, stxBtcRate } = useSupportedCoinRates();

src/app/screens/ledger/addStxAddress/index.tsx

@@ -1,7 +1,7 @@
 import stxIcon from '@assets/img/dashboard/stx_icon.svg';
 import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import LedgerFailView from '@components/ledger/failLedgerView';

src/app/screens/ledger/confirmLedgerStxTransaction/index.tsx

@@ -1,7 +1,7 @@
 import checkCircleIcon from '@assets/img/ledger/check_circle.svg';
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';

src/app/screens/ledger/importLedgerAccount/index.tsx

@@ -1,4 +1,5 @@
-import { delay, getDeviceNewAccountIndex, getNewAccountId } from '@common/utils/ledger';
+import { getDeviceNewAccountIndex, getNewAccountId } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';
 import useWalletReducer from '@hooks/useWalletReducer';
 import useWalletSelector from '@hooks/useWalletSelector';

src/app/screens/ledger/verifyLedgerAccountAddress/index.tsx

@@ -1,4 +1,4 @@
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import ActionButton from '@components/button';
 import InfoContainer from '@components/infoContainer';
 import FullScreenHeader from '@components/ledger/fullScreenHeader';

src/app/screens/restoreWallet/paymentAddressTypeSelector.tsx

@@ -90,7 +90,7 @@ export default function PaymentAddressTypeSelector({
   const { data, isLoading } = useQuery({
     // eslint-disable-next-line @tanstack/query/exhaustive-deps
     queryKey: ['onboardingBtcAddressBalance', sha256(seedPhrase.substring(0, 20)).toString()],
-    queryFn: () => getPaymentAccountSummaryForSeedPhrase(btcClient, seedPhrase, 'Mainnet', 20),
+    queryFn: () => getPaymentAccountSummaryForSeedPhrase(btcClient, seedPhrase, 'Mainnet', 10),
   });
 
   useEffect(() => {

src/app/screens/signatureRequest/index.tsx

@@ -1,6 +1,6 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import { makeRpcSuccessResponse, sendRpcResponse } from '@common/utils/rpc/helpers';
 import AccountHeaderComponent from '@components/accountHeader';
 import BottomModal from '@components/bottomModal';

src/app/screens/speedUpTransaction/index.tsx

@@ -1,7 +1,7 @@
 import ledgerConnectDefaultIcon from '@assets/img/ledger/ledger_connect_default.svg';
 import ledgerConnectBtcIcon from '@assets/img/ledger/ledger_import_connect_btc.svg';
 import ledgerConnectStxIcon from '@assets/img/ledger/ledger_import_connect_stx.svg';
-import { delay } from '@common/utils/ledger';
+import { delay } from '@common/utils/promises';
 import BottomModal from '@components/bottomModal';
 import ActionButton from '@components/button';
 import LedgerConnectionView from '@components/ledger/connectLedgerView';

src/common/utils/ledger.ts

@@ -1,10 +1,5 @@
 import type { Account, NetworkType } from '@secretkeylabs/xverse-core';
 
-export const delay = (ms: number) =>
-  new Promise((res) => {
-    setTimeout(res, ms);
-  });
-
 export const filterLedgerAccountsByNetwork = (accounts: Account[], network: NetworkType) =>
   accounts.filter((account) =>
     account.btcAddresses.taproot.address.startsWith(network === 'Mainnet' ? 'bc1' : 'tb1'),

src/common/utils/promises.ts

@@ -0,0 +1,2 @@
+// a function that sleeps for a given amount of time (ms)
+export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));