diff --git a/apps/extension/src/Setup/AccountCreation/SeedPhrase.tsx b/apps/extension/src/Setup/AccountCreation/SeedPhrase.tsx
index c4077ef7d3..c9190294dc 100644
--- a/apps/extension/src/Setup/AccountCreation/SeedPhrase.tsx
+++ b/apps/extension/src/Setup/AccountCreation/SeedPhrase.tsx
@@ -57,6 +57,7 @@ export const SeedPhrase: React.FC<Props> = (props) => {
             words={seedPhrase}
           />
           <FeedbackButton
+            data-testid="setup-copy-to-clipboard-button"
             className="text-center mx-auto block"
             successMessage="Copied to clipboard"
             errorMessage="Error trying to copy"
diff --git a/apps/extension/src/Setup/AccountCreation/SeedPhraseConfirmation.tsx b/apps/extension/src/Setup/AccountCreation/SeedPhraseConfirmation.tsx
index 6ed9d71e4c..bd271b4bf4 100644
--- a/apps/extension/src/Setup/AccountCreation/SeedPhraseConfirmation.tsx
+++ b/apps/extension/src/Setup/AccountCreation/SeedPhraseConfirmation.tsx
@@ -100,7 +100,7 @@ export const SeedPhraseConfirmation = (
           className="[&_label]:!text-sm justify-center flex-1"
         >
           <Input
-            data-testd="setup-seed-phrase-verification-1-input"
+            data-testid="setup-seed-phrase-verification-1-input"
             label={`Word #${index1ToConfirm + 1}`}
             value={verificationInput1 || ""}
             error={index1Error}
diff --git a/apps/extension/src/Setup/AccountCreation/SeedPhraseWarning.tsx b/apps/extension/src/Setup/AccountCreation/SeedPhraseWarning.tsx
index b7e71c7267..163fd71667 100644
--- a/apps/extension/src/Setup/AccountCreation/SeedPhraseWarning.tsx
+++ b/apps/extension/src/Setup/AccountCreation/SeedPhraseWarning.tsx
@@ -41,7 +41,7 @@ export const SeedPhraseWarning = ({
       </Stack>
       <footer>
         <ActionButton
-          data-testid="setup-show-phrase-button"
+          data-testid={countdown === 0 && "setup-show-phrase-button"}
           size="lg"
           className={clsx({ "pointer-events-none opacity-50": countdown > 0 })}
           onClick={onComplete}
diff --git a/apps/extension/src/Setup/Common/CreateKeyForm.tsx b/apps/extension/src/Setup/Common/CreateKeyForm.tsx
index b4384b4e54..6b08963378 100644
--- a/apps/extension/src/Setup/Common/CreateKeyForm.tsx
+++ b/apps/extension/src/Setup/Common/CreateKeyForm.tsx
@@ -42,7 +42,7 @@ export default function CreateKeyForm({
     >
       <Stack gap={12} className="justify-center flex-1">
         <AccountAlias
-          data-testid="setup-seedphrase-alias-input"
+          data-testid="setup-seed-phrase-alias-input"
           value={accountName}
           onChange={setAccountName}
         />
diff --git a/apps/extension/src/background/keyring/handler.ts b/apps/extension/src/background/keyring/handler.ts
index d284534ab3..a363b72fc7 100644
--- a/apps/extension/src/background/keyring/handler.ts
+++ b/apps/extension/src/background/keyring/handler.ts
@@ -5,6 +5,7 @@ import {
   QueryAccountsMsg,
   QueryBalancesMsg,
   QueryDefaultAccountMsg,
+  ShieldedSyncMsg,
   VerifyArbitraryMsg,
 } from "provider/messages";
 import { Env, Handler, InternalHandler, Message } from "router";
@@ -60,6 +61,8 @@ export const getHandler: (service: KeyRingService) => Handler = (service) => {
         return handleQueryAccountsMsg(service)(env, msg as QueryAccountsMsg);
       case QueryBalancesMsg:
         return handleQueryBalancesMsg(service)(env, msg as QueryBalancesMsg);
+      case ShieldedSyncMsg:
+        return handleShieldedSyncMsg(service)(env, msg as ShieldedSyncMsg);
       case SetActiveAccountMsg:
         return handleSetActiveAccountMsg(service)(
           env,
@@ -230,6 +233,14 @@ const handleQueryBalancesMsg: (
   };
 };
 
+const handleShieldedSyncMsg: (
+  service: KeyRingService
+) => InternalHandler<ShieldedSyncMsg> = (service) => {
+  return async (_, { addresses }) => {
+    return await service.shieldedSync(addresses);
+  };
+};
+
 const handleQueryParentAccountsMsg: (
   service: KeyRingService
 ) => InternalHandler<QueryParentAccountsMsg> = (service) => {
diff --git a/apps/extension/src/background/keyring/init.ts b/apps/extension/src/background/keyring/init.ts
index 1737bc28ca..d36e14013f 100644
--- a/apps/extension/src/background/keyring/init.ts
+++ b/apps/extension/src/background/keyring/init.ts
@@ -5,6 +5,7 @@ import {
   QueryAccountsMsg,
   QueryBalancesMsg,
   QueryDefaultAccountMsg,
+  ShieldedSyncMsg,
   VerifyArbitraryMsg,
 } from "provider/messages";
 import { Router } from "router";
@@ -38,6 +39,7 @@ export function init(router: Router, service: KeyRingService): void {
   router.registerMessage(QueryAccountsMsg);
   router.registerMessage(QueryDefaultAccountMsg);
   router.registerMessage(QueryBalancesMsg);
+  router.registerMessage(ShieldedSyncMsg);
   router.registerMessage(QueryParentAccountsMsg);
   router.registerMessage(SaveAccountSecretMsg);
   router.registerMessage(ScanAccountsMsg);
diff --git a/apps/extension/src/background/keyring/service.ts b/apps/extension/src/background/keyring/service.ts
index f9d18354be..c706f65b3a 100644
--- a/apps/extension/src/background/keyring/service.ts
+++ b/apps/extension/src/background/keyring/service.ts
@@ -452,6 +452,21 @@ export class KeyRingService {
     return Sdk.has_masp_params();
   }
 
+  async shieldedSync(addresses: string[]): Promise<void> {
+    const vks = [];
+    for await (const address of addresses) {
+      const account = await this.vaultService.findOneOrFail<AccountStore>(
+        KEYSTORE_KEY,
+        "address",
+        address
+      );
+      vks.push(account.public.owner);
+    }
+
+    const query = await this.sdkService.getQuery();
+    await query.shielded_sync(vks);
+  }
+
   async queryBalances(
     owner: string,
     tokens: string[]
diff --git a/apps/extension/src/provider/InjectedNamada.ts b/apps/extension/src/provider/InjectedNamada.ts
index bbcbae86f8..8131ced67d 100644
--- a/apps/extension/src/provider/InjectedNamada.ts
+++ b/apps/extension/src/provider/InjectedNamada.ts
@@ -60,6 +60,13 @@ export class InjectedNamada implements INamada {
     >("balances", props);
   }
 
+  public async shieldedSync(props: { addresses: string[] }): Promise<void> {
+    return await InjectedProxy.requestMethod<{ addresses: string[] }, void>(
+      "shieldedSync",
+      props
+    );
+  }
+
   public async getChain(): Promise<Chain | undefined> {
     return await InjectedProxy.requestMethod<void, Chain>("getChain");
   }
diff --git a/apps/extension/src/provider/Namada.ts b/apps/extension/src/provider/Namada.ts
index d00cb4e487..5d7d377121 100644
--- a/apps/extension/src/provider/Namada.ts
+++ b/apps/extension/src/provider/Namada.ts
@@ -22,6 +22,7 @@ import {
   QueryAccountsMsg,
   QueryBalancesMsg,
   QueryDefaultAccountMsg,
+  ShieldedSyncMsg,
   VerifyArbitraryMsg,
 } from "./messages";
 
@@ -125,6 +126,14 @@ export class Namada implements INamada {
     );
   }
 
+  public async shieldedSync(props: { addresses: string[] }): Promise<void> {
+    const { addresses } = props;
+    return await this.requester?.sendMessage(
+      Ports.Background,
+      new ShieldedSyncMsg(addresses)
+    );
+  }
+
   public async submitTx(props: TxMsgProps): Promise<void> {
     return await this.requester?.sendMessage(
       Ports.Background,
diff --git a/apps/extension/src/provider/messages.ts b/apps/extension/src/provider/messages.ts
index c89ef1398d..d64b7a86b4 100644
--- a/apps/extension/src/provider/messages.ts
+++ b/apps/extension/src/provider/messages.ts
@@ -27,6 +27,7 @@ enum MessageType {
   QueryDefaultAccount = "query-default-account",
   ApproveTx = "approve-tx",
   QueryBalances = "query-balances",
+  ShieldedSync = "shielded-sync",
   SubmitIbcTransfer = "submit-ibc-transfer",
   SubmitLedgerTransfer = "submit-ledger-transfer",
   EncodeRevealPublicKey = "encode-reveal-public-key",
@@ -167,6 +168,28 @@ export class QueryBalancesMsg extends Message<
   }
 }
 
+export class ShieldedSyncMsg extends Message<void> {
+  public static type(): MessageType {
+    return MessageType.ShieldedSync;
+  }
+
+  constructor(public readonly addresses: string[]) {
+    super();
+  }
+
+  validate(): void {
+    validateProps(this, ["addresses"]);
+  }
+
+  route(): string {
+    return Route.KeyRing;
+  }
+
+  type(): string {
+    return ShieldedSyncMsg.type();
+  }
+}
+
 export class QueryDefaultAccountMsg extends Message<
   DerivedAccount | undefined
 > {
diff --git a/apps/namada-interface/src/slices/accounts.ts b/apps/namada-interface/src/slices/accounts.ts
index 162f8e2a59..372fac7a29 100644
--- a/apps/namada-interface/src/slices/accounts.ts
+++ b/apps/namada-interface/src/slices/accounts.ts
@@ -3,7 +3,7 @@ import BigNumber from "bignumber.js";
 import { atom } from "jotai";
 
 import { chains } from "@namada/chains";
-import { getIntegration } from "@namada/integrations";
+import { getIntegration, Integration } from "@namada/integrations";
 import { Account as AccountDetails, ChainKey, TokenType } from "@namada/types";
 
 import { chainAtom } from "slices/chain";
@@ -193,18 +193,55 @@ const balancesAtom = (() => {
 
       set(base, {});
 
-      accounts.forEach(async (account) => {
-        const result = await namada.queryBalances(account.address, [
-          nativeToken || tokenAddress,
-        ]);
-        const balance = result.reduce(
-          (acc, curr) => ({ ...acc, [curr.token]: new BigNumber(curr.amount) }),
-          {} as Balance
-        );
-        set(base, { ...get(base), [account.address]: balance });
+      // Split accounts into transparent and shielded
+      const [transparentAccounts, shieldedAccounts] = accounts.reduce((acc, curr) => {
+        if (curr.isShielded) {
+          acc[1].push(curr)
+        } else {
+          acc[0].push(curr)
+        }
+        return acc;
+      }, [[], []] as [AccountDetails[], AccountDetails[]]);
+
+      const token = nativeToken || tokenAddress;
+
+      // We query the balances for the transparent accounts first as it's faster
+      const transparentBalances = await Promise.all(queryBalance(namada, transparentAccounts, token));
+      transparentBalances.forEach(([address, balance ]) => {
+        set(base, { ...get(base), [address]: balance });
       });
+
+
+      // Before querying the shielded balances we need to sync the shielded context
+      const shieldedAddresses = accounts
+        .filter((account) => account.isShielded)
+        .map((account) => account.address);
+      await namada.sync(shieldedAddresses);
+
+      const shieldedBalances = await Promise.all(queryBalance(namada, shieldedAccounts, token));
+      shieldedBalances.forEach(([address, balance ]) => {
+        set(base, { ...get(base), [address]: balance });
+      });
+
     }
   );
 })();
 
+const queryBalance = (
+  int: InstanceType<Integration>,
+  accounts: AccountDetails[],
+  token: string,
+): Promise<readonly [string, Balance]>[] => {
+  return accounts.map(async (account) => {
+    const result = await int.queryBalances(account.address, [token]);
+    return [
+      account.address,
+      result.reduce(
+        (acc, curr) => ({ ...acc, [curr.token]: new BigNumber(curr.amount) }),
+        {} as Balance,
+      ),
+    ] as const;
+  });
+};
+
 export { accountsAtom, balancesAtom };
diff --git a/e2e/setup-namada.sh b/e2e/setup-namada.sh
index 84d2d081f1..8ce929294d 100755
--- a/e2e/setup-namada.sh
+++ b/e2e/setup-namada.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-VERSION="v0.31.6"
+VERSION="v0.31.8"
 CURRENT_VERSION=""
 NAMADA_DIR=".namada"
 NAMADA_BASE_DIR=".namada/basedir"
diff --git a/e2e/src/partial/setup.ts b/e2e/src/partial/setup.ts
index 6f5fff20f3..3c5182feb6 100644
--- a/e2e/src/partial/setup.ts
+++ b/e2e/src/partial/setup.ts
@@ -50,20 +50,24 @@ export const importAccount = async (
   await page.waitForNavigation();
 
   // Fill alias and pwd
-  await (
-    await page.$("[data-testid='setup-import-keys-alias-input']")
-  )?.type(alias0);
+  const aliasInput = await page.$(
+    "[data-testid='setup-seed-phrase-alias-input'] input"
+  );
+  await aliasInput?.type(alias0);
 
   const pwdInputs = await page.$$(
-    "[data-testid='setup-import-keys-pwd-input']"
+    "[data-testid='setup-seed-phrase-pwd-input'] input"
   );
+
   for await (const input of pwdInputs) {
     await input.type(pwd);
   }
 
   // Click on next button
   (
-    await page.waitForSelector("[data-testid='setup-import-keys-next-button']")
+    await page.waitForSelector(
+      "[data-testid='setup-seed-phrase-verification-next-btn']"
+    )
   )?.click();
   await page.waitForNavigation();
 
@@ -92,7 +96,9 @@ export const createAccount = async (
 
   // Click on show phrase
   (
-    await page.waitForSelector("[data-testid='setup-show-phrase-button']")
+    await page.waitForSelector("[data-testid='setup-show-phrase-button']", {
+      timeout: 5500,
+    })
   )?.click();
 
   await page.waitForNavigation();
@@ -107,7 +113,7 @@ export const createAccount = async (
 
   const words = await page.$$eval(
     "[data-testid='setup-seed-phrase-list'] li",
-    (els) => els.map((el) => el.textContent as string)
+    (els) => els.map((el) => (el.textContent as string).replace(/\d+\s/, ""))
   );
 
   expect(await page.evaluate(() => navigator.clipboard.readText())).toEqual(
@@ -123,11 +129,11 @@ export const createAccount = async (
   await page.waitForNavigation();
 
   // Verify mnemonic
-  const input1 = await page.$(
+  const input1 = await page.waitForSelector(
     "[data-testid='setup-seed-phrase-verification-1-input']"
   );
 
-  const input2 = await page.$(
+  const input2 = await page.waitForSelector(
     "[data-testid='setup-seed-phrase-verification-2-input']"
   );
 
@@ -144,14 +150,21 @@ export const createAccount = async (
   await (await input1?.$("input"))?.type(words[Number(word1Number) - 1]);
   await (await input2?.$("input"))?.type(words[Number(word2Number) - 1]);
 
+  (
+    await page.waitForSelector(
+      "[data-testid='setup-seed-phrase-verification-next-btn']"
+    )
+  )?.click();
+  await page.waitForNavigation();
+
   // Fill alias and pwd
   const aliasInput = await page.$(
-    "[data-testid='setup-seed-phrase-alias-input']"
+    "[data-testid='setup-seed-phrase-alias-input'] input"
   );
   await aliasInput?.type(alias0);
 
   const pwdInputs = await page.$$(
-    "[data-testid='setup-seed-phrase-pwd-input']"
+    "[data-testid='setup-seed-phrase-pwd-input'] input"
   );
 
   for await (const input of pwdInputs) {
@@ -163,7 +176,6 @@ export const createAccount = async (
       "[data-testid='setup-seed-phrase-verification-next-btn']"
     )
   )?.click();
-
   await page.waitForNavigation();
 
   const closePageBtn = await page.waitForSelector(
diff --git a/packages/components/src/FeedbackButton.tsx b/packages/components/src/FeedbackButton.tsx
index d6c3a4314e..c67747db07 100644
--- a/packages/components/src/FeedbackButton.tsx
+++ b/packages/components/src/FeedbackButton.tsx
@@ -8,6 +8,7 @@ type Props = {
   children: React.ReactNode;
   successMessage: string;
   errorMessage: string;
+  "data-testid"?: string;
   onAction: () => void;
 } & React.ComponentPropsWithoutRef<"button">;
 
@@ -16,6 +17,7 @@ export const FeedbackButton = ({
   successMessage,
   errorMessage,
   onAction,
+  "data-testid": dataTestid,
   ...props
 }: Props): JSX.Element => {
   const [displaySuccess, setDisplaySuccess] = useState(false);
@@ -49,6 +51,7 @@ export const FeedbackButton = ({
   return (
     <div className="relative">
       <button
+        data-testid={dataTestid}
         onClick={onPerformClick}
         className={clsx(
           "text-white font-medium underline text-xs hover:text-yellow",
diff --git a/packages/integrations/src/Keplr.ts b/packages/integrations/src/Keplr.ts
index 25f17e1283..440679c019 100644
--- a/packages/integrations/src/Keplr.ts
+++ b/packages/integrations/src/Keplr.ts
@@ -46,7 +46,7 @@ class Keplr implements Integration<Account, OfflineSigner> {
    * override keplr instance for testing
    * @param chain
    */
-  constructor(public readonly chain: Chain) { }
+  constructor(public readonly chain: Chain) {}
 
   private init(): void {
     if (!this._keplr) {
@@ -221,6 +221,9 @@ class Keplr implements Integration<Account, OfflineSigner> {
         };
       });
   }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async sync(_addresses: string[]): Promise<void> {}
 }
 
 export default Keplr;
diff --git a/packages/integrations/src/Metamask.ts b/packages/integrations/src/Metamask.ts
index c729e654df..a92db14848 100644
--- a/packages/integrations/src/Metamask.ts
+++ b/packages/integrations/src/Metamask.ts
@@ -31,7 +31,7 @@ declare global {
 
 class Metamask implements Integration<Account, unknown> {
   private _ethereum: MetaMaskInpageProvider | undefined;
-  constructor(public readonly chain: Chain) { }
+  constructor(public readonly chain: Chain) {}
 
   private init(): void {
     const provider = window.ethereum;
@@ -150,6 +150,9 @@ class Metamask implements Integration<Account, unknown> {
       // { token: "TESTERC20", amount: String(testErc20Balance) || "0" },
     ];
   }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async sync(_addresses: string[]): Promise<void> {}
 }
 
 export default Metamask;
diff --git a/packages/integrations/src/Namada.ts b/packages/integrations/src/Namada.ts
index e6516524b2..3e54aef22b 100644
--- a/packages/integrations/src/Namada.ts
+++ b/packages/integrations/src/Namada.ts
@@ -92,4 +92,8 @@ export default class Namada implements Integration<Account, Signer> {
       amount: balance.amount.toString() || new BigNumber(0).toString(),
     }));
   }
+
+  public async sync(addresses: string[]): Promise<void> {
+    await this._namada?.shieldedSync({ addresses });
+  }
 }
diff --git a/packages/integrations/src/hooks/useIntegration.ts b/packages/integrations/src/hooks/useIntegration.ts
index 953f2c3482..f7f898cd91 100644
--- a/packages/integrations/src/hooks/useIntegration.ts
+++ b/packages/integrations/src/hooks/useIntegration.ts
@@ -11,7 +11,7 @@ import { useUntil } from "@namada/hooks";
 import { Keplr, Metamask, Namada } from "@namada/integrations";
 import { Chain, ChainKey, ExtensionKey } from "@namada/types";
 
-type Integration = typeof Namada | typeof Keplr | typeof Metamask;
+export type Integration = typeof Namada | typeof Keplr | typeof Metamask;
 type ChainId = string;
 type IntegrationsMap = Record<ExtensionKey, Integration>;
 export type Integrations = Record<ChainId, InstanceType<Integration>>;
diff --git a/packages/integrations/src/types/Integration.ts b/packages/integrations/src/types/Integration.ts
index f02737068d..3bd3606086 100644
--- a/packages/integrations/src/types/Integration.ts
+++ b/packages/integrations/src/types/Integration.ts
@@ -24,4 +24,5 @@ export interface Integration<T, S> {
     type: AccountType
   ) => Promise<void>;
   queryBalances: (owner: string, tokens?: string[]) => Promise<TokenBalance[]>;
+  sync: (owners: string[]) => Promise<void>;
 }
diff --git a/packages/shared/lib/Cargo.lock b/packages/shared/lib/Cargo.lock
index a301eec1e0..5e4e6ad095 100644
--- a/packages/shared/lib/Cargo.lock
+++ b/packages/shared/lib/Cargo.lock
@@ -2710,8 +2710,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "namada"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "async-trait",
  "bimap",
@@ -2774,8 +2774,8 @@ dependencies = [
 
 [[package]]
 name = "namada_account"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2786,8 +2786,8 @@ dependencies = [
 
 [[package]]
 name = "namada_core"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "bech32 0.8.1",
  "borsh",
@@ -2829,8 +2829,8 @@ dependencies = [
 
 [[package]]
 name = "namada_ethereum_bridge"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "ethabi",
@@ -2858,8 +2858,8 @@ dependencies = [
 
 [[package]]
 name = "namada_gas"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2869,8 +2869,8 @@ dependencies = [
 
 [[package]]
 name = "namada_governance"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "itertools 0.10.5",
@@ -2887,8 +2887,8 @@ dependencies = [
 
 [[package]]
 name = "namada_ibc"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "ibc",
@@ -2911,8 +2911,8 @@ dependencies = [
 
 [[package]]
 name = "namada_macros"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2921,8 +2921,8 @@ dependencies = [
 
 [[package]]
 name = "namada_merkle_tree"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "eyre",
@@ -2935,8 +2935,8 @@ dependencies = [
 
 [[package]]
 name = "namada_parameters"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2947,8 +2947,8 @@ dependencies = [
 
 [[package]]
 name = "namada_proof_of_stake"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "data-encoding",
@@ -2968,16 +2968,16 @@ dependencies = [
 
 [[package]]
 name = "namada_replay_protection"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "namada_core",
 ]
 
 [[package]]
 name = "namada_sdk"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "async-trait",
  "bimap",
@@ -3033,8 +3033,8 @@ dependencies = [
 
 [[package]]
 name = "namada_shielded_token"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "masp_primitives",
@@ -3049,8 +3049,8 @@ dependencies = [
 
 [[package]]
 name = "namada_state"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "ics23",
@@ -3072,8 +3072,8 @@ dependencies = [
 
 [[package]]
 name = "namada_storage"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "itertools 0.10.5",
@@ -3088,8 +3088,8 @@ dependencies = [
 
 [[package]]
 name = "namada_token"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "namada_core",
  "namada_shielded_token",
@@ -3099,8 +3099,8 @@ dependencies = [
 
 [[package]]
 name = "namada_trans_token"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "namada_core",
  "namada_storage",
@@ -3108,8 +3108,8 @@ dependencies = [
 
 [[package]]
 name = "namada_tx"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "ark-bls12-381",
  "borsh",
@@ -3130,8 +3130,8 @@ dependencies = [
 
 [[package]]
 name = "namada_tx_env"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "namada_core",
  "namada_storage",
@@ -3139,8 +3139,8 @@ dependencies = [
 
 [[package]]
 name = "namada_vote_ext"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "borsh",
  "namada_core",
@@ -3150,8 +3150,8 @@ dependencies = [
 
 [[package]]
 name = "namada_vp_env"
-version = "0.31.7"
-source = "git+https://github.com/anoma/namada#78519dd174200998c3885abb1cd714f566c4a648"
+version = "0.31.8"
+source = "git+https://github.com/anoma/namada#2535c9c8bb899f4f3ae0c9e9accaf24f30e8bff4"
 dependencies = [
  "derivative",
  "masp_primitives",
diff --git a/packages/shared/lib/Cargo.toml b/packages/shared/lib/Cargo.toml
index 32e2dfc0b3..d13354da14 100644
--- a/packages/shared/lib/Cargo.toml
+++ b/packages/shared/lib/Cargo.toml
@@ -21,7 +21,7 @@ chrono = "0.4.22"
 getrandom = { version = "0.2.7", features = ["js"] }
 gloo-utils = { version = "0.1.5", features = ["serde"] }
 js-sys = "0.3.60"
-namada = { git = "https://github.com/anoma/namada", version = "0.31.6", default-features = false, features = ["namada-sdk"] }
+namada = { git = "https://github.com/anoma/namada", version = "0.31.8", default-features = false, features = ["namada-sdk"] }
 rand = "0.8.5"
 rexie = "0.5"
 serde = "^1.0.181"
diff --git a/packages/shared/lib/src/query.rs b/packages/shared/lib/src/query.rs
index ed1a615cbb..8eace34250 100644
--- a/packages/shared/lib/src/query.rs
+++ b/packages/shared/lib/src/query.rs
@@ -12,6 +12,7 @@ use namada::masp::ExtendedViewingKey;
 use namada::proof_of_stake::Epoch;
 use namada::sdk::masp::{DefaultLogger, ShieldedContext};
 use namada::sdk::masp_primitives::asset_type::AssetType;
+use namada::sdk::masp_primitives::sapling::ViewingKey;
 use namada::sdk::masp_primitives::transaction::components::ValueSum;
 use namada::sdk::masp_primitives::zip32::ExtendedFullViewingKey;
 use namada::sdk::rpc::{
@@ -253,30 +254,28 @@ impl Query {
         Ok(result)
     }
 
-    /// Queries shielded balance for a given extended viewing key
-    ///
-    /// # Arguments
-    ///
-    /// * `xvk` - Extended viewing key
-    async fn query_shielded_balance(
-        &self,
-        xvk: ExtendedViewingKey,
-    ) -> Result<Vec<(Address, token::Amount)>, JsError> {
-        let viewing_key = ExtendedFullViewingKey::from(xvk).fvk.vk;
+    pub async fn shielded_sync(&self, owners: Box<[JsValue]>) -> Result<(), JsError> {
+        let owners: Vec<ViewingKey> = owners
+            .into_iter()
+            .filter_map(|owner| owner.as_string())
+            .map(|o| {
+                ExtendedFullViewingKey::from(ExtendedViewingKey::from_str(&o).unwrap())
+                    .fvk
+                    .vk
+            })
+            .collect();
 
-        // We are recreating shielded context to avoid multiple mutable borrows
         let mut shielded: ShieldedContext<masp::WebShieldedUtils> = ShieldedContext::default();
 
-        let _ = shielded.load().await;
-        // TODO: pass supported asset types
+        let _ = shielded.load().await?;
         let _ = shielded
             .precompute_asset_types(
                 &self.client,
                 vec![&Address::from_str("tnam1qxgfw7myv4dh0qna4hq0xdg6lx77fzl7dcem8h7e").unwrap()],
             )
-            .await;
+            .await?;
 
-        let _ = shielded.save().await;
+        let _ = shielded.save().await?;
 
         shielded
             .fetch(
@@ -285,10 +284,28 @@ impl Query {
                 None,
                 1,
                 &[],
-                &[viewing_key],
+                &owners,
             )
             .await?;
 
+        Ok(())
+    }
+
+    /// Queries shielded balance for a given extended viewing key
+    ///
+    /// # Arguments
+    ///
+    /// * `xvk` - Extended viewing key
+    async fn query_shielded_balance(
+        &self,
+        xvk: ExtendedViewingKey,
+    ) -> Result<Vec<(Address, token::Amount)>, JsError> {
+        let viewing_key = ExtendedFullViewingKey::from(xvk).fvk.vk;
+
+        // We are recreating shielded context to avoid multiple mutable borrows
+        let mut shielded: ShieldedContext<masp::WebShieldedUtils> = ShieldedContext::default();
+        shielded.load().await?;
+
         let epoch = query_epoch(&self.client).await?;
         let balance = shielded
             .compute_exchanged_balance(&self.client, &WebIo, &viewing_key, epoch)
diff --git a/packages/shared/lib/src/sdk/masp.rs b/packages/shared/lib/src/sdk/masp.rs
index 5cbd37f535..f7f3505beb 100644
--- a/packages/shared/lib/src/sdk/masp.rs
+++ b/packages/shared/lib/src/sdk/masp.rs
@@ -147,9 +147,15 @@ impl ShieldedUtils for WebShieldedUtils {
             .map_err(Self::to_io_err)?;
         let stored_ctx_bytes = to_bytes(stored_ctx);
 
+        let context: ShieldedContext<U> = if stored_ctx_bytes.is_empty() {
+            ShieldedContext::default()
+        } else {
+            ShieldedContext::deserialize(&mut &stored_ctx_bytes[..])?
+        };
+
         *ctx = ShieldedContext {
             utils: ctx.utils.clone(),
-            ..ShieldedContext::deserialize(&mut &stored_ctx_bytes[..])?
+            ..context
         };
 
         Ok(())
diff --git a/packages/shared/lib/src/sdk/mod.rs b/packages/shared/lib/src/sdk/mod.rs
index 6556067f84..e5e45298e1 100644
--- a/packages/shared/lib/src/sdk/mod.rs
+++ b/packages/shared/lib/src/sdk/mod.rs
@@ -12,7 +12,8 @@ use namada::core::borsh::{self, BorshDeserialize};
 use namada::hash::Hash;
 use namada::key::{common, ed25519, SigScheme};
 use namada::ledger::eth_bridge::bridge_pool::build_bridge_pool_tx;
-use namada::sdk::masp::ShieldedContext;
+use namada::masp::TransferSource;
+use namada::sdk::masp::{DefaultLogger, ShieldedContext};
 use namada::sdk::rpc::query_epoch;
 use namada::sdk::signing::{find_key_by_pk, SigningTxData};
 use namada::sdk::tx::{
@@ -271,7 +272,34 @@ impl Sdk {
         xsk: Option<String>,
         _gas_payer: Option<String>,
     ) -> Result<BuiltTx, JsError> {
-        let mut args = tx::transfer_tx_args(transfer_msg, tx_msg, xsk)?;
+        let mut args = tx::transfer_tx_args(transfer_msg, tx_msg, xsk.clone())?;
+
+        // TODO: this might not be needed. I will test it out in future
+        match args.source {
+            TransferSource::Address(_) => {}
+            TransferSource::ExtendedSpendingKey(xsk) => {
+                self.namada
+                    .shielded_mut()
+                    .await
+                    .fetch(
+                        self.namada.client(),
+                        &DefaultLogger::new(&WebIo),
+                        None,
+                        1,
+                        &[xsk.into()],
+                        &[],
+                    )
+                    .await?;
+            }
+        }
+
+        // It's temporary solution to add xsk to wallet as xvk is queried when unshielding
+        // This will change in namada in the future
+        match xsk {
+            Some(xsk) => self.add_spending_key(&xsk, &"temp").await,
+            None => {}
+        }
+
         let (tx, signing_data, _) = build_transfer(&self.namada, &mut args).await?;
 
         Ok(BuiltTx { tx, signing_data })
diff --git a/packages/shared/lib/src/sdk/wallet.rs b/packages/shared/lib/src/sdk/wallet.rs
index fe386b1fa0..0d7f9efad6 100644
--- a/packages/shared/lib/src/sdk/wallet.rs
+++ b/packages/shared/lib/src/sdk/wallet.rs
@@ -40,7 +40,7 @@ pub fn add_spending_key(wallet: &mut Wallet<BrowserWalletUtils>, xsk: &str, alia
     // xsk is decrypted outside of this wallet instance, so we specify None below
     if wallet
         .store_mut()
-        .insert_spending_key::<BrowserWalletUtils>(alias.clone(), xsk, None, None, false)
+        .insert_spending_key::<BrowserWalletUtils>(alias.clone(), xsk, None, None, true)
         .is_none()
     {
         panic!("Action cancelled, no changes persisted.");
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index 96aa44eabb..0eae874f0b 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -45,7 +45,7 @@ const promiseWithTimeout =
 export class Query extends RustQuery {
   private _query_proposals = super.query_proposals.bind(this);
   query_balance = promiseWithTimeout(super.query_balance.bind(this), {
-    timeout: 120000,
+    timeout: 600000,
   });
   query_epoch = promiseWithTimeout(super.query_epoch.bind(this));
   query_all_validator_addresses = promiseWithTimeout(
diff --git a/packages/types/src/namada.ts b/packages/types/src/namada.ts
index 0a164d525c..5a020225c3 100644
--- a/packages/types/src/namada.ts
+++ b/packages/types/src/namada.ts
@@ -32,6 +32,7 @@ export interface Namada {
   balances(
     props: BalancesProps
   ): Promise<{ token: string; amount: string }[] | undefined>;
+  shieldedSync(props: { addresses: string[] }): Promise<void>;
   connect(chainId?: string): Promise<void>;
   isConnected(): Promise<boolean | undefined>;
   defaultAccount(chainId?: string): Promise<DerivedAccount | undefined>;