diff --git a/apps/extension/src/Approvals/ConfirmSignLedgerTx.tsx b/apps/extension/src/Approvals/ConfirmSignLedgerTx.tsx
index 81a346637..1a57a74e9 100644
--- a/apps/extension/src/Approvals/ConfirmSignLedgerTx.tsx
+++ b/apps/extension/src/Approvals/ConfirmSignLedgerTx.tsx
@@ -188,8 +188,6 @@ export const ConfirmSignLedgerTx: React.FC<Props> = ({ details }) => {
       setStepTwoDescription("Preparing transaction...");
 
       try {
-        // TODO: we have to check if the signer is disposable or not
-
         const accountDetails = await requester.sendMessage(
           Ports.Background,
           new QueryAccountDetailsMsg(signer)
@@ -235,6 +233,11 @@ export const ConfirmSignLedgerTx: React.FC<Props> = ({ details }) => {
                   .type
             )
         );
+        const disposableSigner = txDetails.reduce((acc, curr) => {
+          console.log("www", curr.wrapperFeePayer, accountDetails.address);
+          return acc || curr.wrapperFeePayer !== accountDetails.address;
+        }, false);
+
         // For now we work under the assumption that we can't batch transfers from masp with other tx types
         const fromMasp =
           transferTypes.includes("Shielded") ||
@@ -257,7 +260,9 @@ export const ConfirmSignLedgerTx: React.FC<Props> = ({ details }) => {
             });
             // Adds new signature to the collection
             await handleMaspSignTx(ledger, tx, zip32Path, maspSignatures);
-          } else {
+          }
+
+          if (!disposableSigner) {
             const bip44Path = makeBip44Path(chains.namada.bip44.coinType, path);
             // Adds new signature to the collection
             await handleSignTx(ledger, tx, bip44Path, signatures);
@@ -273,10 +278,18 @@ export const ConfirmSignLedgerTx: React.FC<Props> = ({ details }) => {
             Ports.Background,
             new ReplaceMaspSignaturesMsg(msgId, maspSignatures)
           );
-          await requester.sendMessage(
-            Ports.Background,
-            new SubmitApprovedSignTxMsg(msgId, signer)
-          );
+
+          if (disposableSigner) {
+            await requester.sendMessage(
+              Ports.Background,
+              new SubmitApprovedSignTxMsg(msgId, signer)
+            );
+          } else {
+            await requester.sendMessage(
+              Ports.Background,
+              new SubmitApprovedSignLedgerTxMsg(msgId, signatures)
+            );
+          }
         } else {
           await requester.sendMessage(
             Ports.Background,
diff --git a/apps/extension/src/background/keyring/keyring.ts b/apps/extension/src/background/keyring/keyring.ts
index 9dc26aa2f..c27cfc475 100644
--- a/apps/extension/src/background/keyring/keyring.ts
+++ b/apps/extension/src/background/keyring/keyring.ts
@@ -796,7 +796,7 @@ export class KeyRing {
     const realAddress = disposableKey?.realAddress || signer;
 
     // If disposable key is provided, use it to map real address to spending key
-    const xsks = [await this.getSpendingKey(realAddress)];
+    const xsks = [await this.getSpendingKey(disposableKey ? realAddress : signer)];
 
     const { signing } = this.sdkService.getSdk();
 
diff --git a/apps/namadillo/src/App/Common/GasFeeModal.tsx b/apps/namadillo/src/App/Common/GasFeeModal.tsx
index 3bbb5bf20..dee46ebd6 100644
--- a/apps/namadillo/src/App/Common/GasFeeModal.tsx
+++ b/apps/namadillo/src/App/Common/GasFeeModal.tsx
@@ -3,7 +3,10 @@ import {
   ActionButton,
   AmountInput,
   Modal,
+  Stack,
   StyledSelectBox,
+  Text,
+  ToggleButton,
 } from "@namada/components";
 import { transparentBalanceAtom } from "atoms/accounts";
 import { shieldedBalanceAtom } from "atoms/balance";
@@ -95,7 +98,6 @@ const useBuildGasOption = ({
 export const GasFeeModal = ({
   feeProps,
   onClose,
-  isShielded = false,
 }: {
   feeProps: TransactionFeeProps;
   onClose: () => void;
@@ -105,8 +107,11 @@ export const GasFeeModal = ({
     gasConfig,
     gasEstimate,
     gasPriceTable,
+    gasSource,
+    gasSourceSwitch,
     onChangeGasLimit,
     onChangeGasToken,
+    onChangeGasSource,
   } = feeProps;
 
   const sortByNativeToken = useSortByNativeToken();
@@ -118,7 +123,7 @@ export const GasFeeModal = ({
   const findUserBalanceByTokenAddress = (tokenAddres: string): BigNumber => {
     // TODO: we need to refactor userShieldedBalances to return Balance[] type instead
     const balances =
-      isShielded ?
+      gasSource === "shielded" ?
         shieldedAmount.data?.map((balance) => ({
           minDenomAmount: balance.minDenomAmount,
           tokenAddress: balance.address,
@@ -207,6 +212,39 @@ export const GasFeeModal = ({
           <span className="text-xs text-neutral-500 text-right">Balance</span>
           <span className="text-xs text-neutral-500 text-right">Fee</span>
         </div>
+        {gasSourceSwitch && gasSource !== "shielded" && (
+          <Text className="text-red-600 text-sm">
+            Warning! Using fees from your transparent account will reveal data.
+            <br />
+            To keep your data protected we recommend moving assets to the
+            <br />
+            shield pool to pay fees.
+          </Text>
+        )}
+        <Stack
+          direction="horizontal"
+          className="justify-between align-middle mt-4 mb-1"
+        >
+          <div className="text-sm">Fee Token</div>
+          {gasSourceSwitch && (
+            <ToggleButton
+              label={
+                gasSource === "shielded" ? "Shielded Balance" : (
+                  "Transparent Balance"
+                )
+              }
+              color="white"
+              activeColor="yellow"
+              checked={gasSource === "shielded"}
+              onChange={() =>
+                onChangeGasSource(
+                  gasSource === "shielded" ? "transparent" : "shielded"
+                )
+              }
+              containerProps={{ className: "gap-3 text-xs" }}
+            />
+          )}
+        </Stack>
         <StyledSelectBox
           id="fee-token-select"
           value={gasConfig.gasToken}
diff --git a/apps/namadillo/src/App/Common/TransactionFeeButton.tsx b/apps/namadillo/src/App/Common/TransactionFeeButton.tsx
index bcdd43266..b3cafe135 100644
--- a/apps/namadillo/src/App/Common/TransactionFeeButton.tsx
+++ b/apps/namadillo/src/App/Common/TransactionFeeButton.tsx
@@ -11,11 +11,9 @@ import { TransactionFee } from "./TransactionFee";
 export const TransactionFeeButton = ({
   feeProps,
   className,
-  isShieldedTransfer = false,
 }: {
   feeProps: TransactionFeeProps;
   className?: string;
-  isShieldedTransfer?: boolean;
 }): JSX.Element => {
   const [modalOpen, setModalOpen] = useState(false);
   const chainAssetsMap = useAtomValue(chainAssetsMapAtom);
@@ -54,11 +52,7 @@ export const TransactionFeeButton = ({
         </div>
       </div>
       {modalOpen && (
-        <GasFeeModal
-          feeProps={feeProps}
-          onClose={() => setModalOpen(false)}
-          isShielded={isShieldedTransfer}
-        />
+        <GasFeeModal feeProps={feeProps} onClose={() => setModalOpen(false)} />
       )}
     </>
   );
diff --git a/apps/namadillo/src/App/Masp/MaspUnshield.tsx b/apps/namadillo/src/App/Masp/MaspUnshield.tsx
index 803cec80b..0608417dc 100644
--- a/apps/namadillo/src/App/Masp/MaspUnshield.tsx
+++ b/apps/namadillo/src/App/Masp/MaspUnshield.tsx
@@ -162,7 +162,6 @@ export const MaspUnshield: React.FC = () => {
           isShieldedAddress: false,
         }}
         feeProps={feeProps}
-        isShieldedTx={true}
         isSubmitting={isPerformingTransfer || isSuccess}
         errorMessage={generalErrorMessage}
         onSubmitTransfer={onSubmitTransfer}
diff --git a/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx b/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
index 33233a536..5d4742f38 100644
--- a/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
+++ b/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
@@ -202,7 +202,6 @@ export const NamadaTransfer: React.FC = () => {
         feeProps={feeProps}
         currentStatus={currentStatus}
         currentStatusExplanation={currentStatusExplanation}
-        isShieldedTx={isSourceShielded}
         isSubmitting={
           isPerformingTransfer || isTransferSuccessful || Boolean(completedAt)
         }
diff --git a/apps/namadillo/src/App/Transfer/TransferDestination.tsx b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
index 54efd5f08..4764fb576 100644
--- a/apps/namadillo/src/App/Transfer/TransferDestination.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
@@ -15,7 +15,6 @@ import { TokenAmountCard } from "./TokenAmountCard";
 
 type TransferDestinationProps = {
   isShieldedAddress?: boolean;
-  isShieldedTx?: boolean;
   onChangeShielded?: (isShielded: boolean) => void;
   chain?: Chain;
   wallet?: WalletProvider;
@@ -43,7 +42,6 @@ export const TransferDestination = ({
   wallet,
   walletAddress,
   isShieldedAddress,
-  isShieldedTx = false,
   onChangeShielded,
   gasDisplayAmount,
   gasAsset,
@@ -173,12 +171,7 @@ export const TransferDestination = ({
       {!isSubmitting && (
         <footer className="flex items-center mt-10">
           {changeFeeEnabled ?
-            feeProps && (
-              <TransactionFeeButton
-                feeProps={feeProps}
-                isShieldedTransfer={isShieldedTx}
-              />
-            )
+            feeProps && <TransactionFeeButton feeProps={feeProps} />
           : gasDisplayAmount &&
             gasAsset && (
               <TransactionFee
diff --git a/apps/namadillo/src/App/Transfer/TransferModule.tsx b/apps/namadillo/src/App/Transfer/TransferModule.tsx
index c0e0aa136..7bcc68c17 100644
--- a/apps/namadillo/src/App/Transfer/TransferModule.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferModule.tsx
@@ -95,7 +95,6 @@ export type TransferModuleProps = {
   currentStatus?: string;
   currentStatusExplanation?: string;
   completedAt?: Date;
-  isShieldedTx?: boolean;
   buttonTextErrors?: Partial<Record<ValidationResult, string>>;
   onComplete?: () => void;
 } & (
@@ -135,7 +134,6 @@ export const TransferModule = ({
   completedAt,
   onComplete,
   buttonTextErrors = {},
-  isShieldedTx = false,
 }: TransferModuleProps): JSX.Element => {
   const navigate = useNavigate();
   const location = useLocation();
@@ -470,7 +468,6 @@ export const TransferModule = ({
               destination.isShieldedAddress
             )}
             isShieldedAddress={destination.isShieldedAddress}
-            isShieldedTx={isShieldedTx}
             onChangeShielded={destination.onChangeShielded}
             address={destination.customAddress}
             onToggleCustomAddress={
diff --git a/apps/namadillo/src/App/WorkerTest.tsx b/apps/namadillo/src/App/WorkerTest.tsx
deleted file mode 100644
index c6475e36a..000000000
--- a/apps/namadillo/src/App/WorkerTest.tsx
+++ /dev/null
@@ -1,241 +0,0 @@
-import * as Comlink from "comlink";
-
-import {
-  AccountType,
-  ShieldedTransferMsgValue,
-  ShieldingTransferMsgValue,
-  UnshieldingTransferMsgValue,
-} from "@namada/types";
-import {
-  accountsAtom,
-  defaultAccountAtom,
-  disposableSignerAtom,
-} from "atoms/accounts";
-import { chainAtom, nativeTokenAddressAtom } from "atoms/chain";
-import { maspIndexerUrlAtom, rpcUrlAtom } from "atoms/settings";
-import BigNumber from "bignumber.js";
-import { useAtom, useAtomValue } from "jotai";
-import { isPublicKeyRevealed, signTx } from "lib/query";
-import { Shield, ShieldedTransfer, Unshield } from "workers/MaspTxMessages";
-import {
-  Worker as MaspTxWorkerApi,
-  registerTransferHandlers,
-} from "workers/MaspTxWorker";
-import MaspTxWorker from "workers/MaspTxWorker?worker";
-import { Worker as ShieldedSyncWorkerApi } from "workers/ShieldedSyncWorker";
-import ShieldedSyncWorker from "workers/ShieldedSyncWorker?worker";
-
-export function WorkerTest(): JSX.Element {
-  const rpcUrl = useAtomValue(rpcUrlAtom);
-
-  const { data: account } = useAtomValue(defaultAccountAtom);
-  const [{ refetch }] = useAtom(disposableSignerAtom);
-  const { data: accounts } = useAtomValue(accountsAtom);
-  const { data: chain } = useAtomValue(chainAtom);
-  const { data: token } = useAtomValue(nativeTokenAddressAtom);
-  const maspIndexerUrl = useAtomValue(maspIndexerUrlAtom);
-  const shieldedAccount = accounts?.find(
-    (a) => a.type === AccountType.ShieldedKeys && a.alias === account?.alias
-  );
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (window as any).shieldedSync = async (vk: string) => {
-    const worker = new ShieldedSyncWorker();
-    const shieldedSyncWorker = Comlink.wrap<ShieldedSyncWorkerApi>(worker);
-    await shieldedSyncWorker.init({
-      type: "init",
-      payload: {
-        rpcUrl,
-        token: token!,
-      },
-    });
-
-    await shieldedSyncWorker.sync({
-      type: "sync",
-      payload: {
-        vks: [{ key: vk, birthday: 0 }],
-        chainId: chain!.id,
-      },
-    });
-
-    worker.terminate();
-  };
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (window as any).shield = async (target: string, amount: number) => {
-    registerTransferHandlers();
-    const worker = new MaspTxWorker();
-    const shieldWorker = Comlink.wrap<MaspTxWorkerApi>(worker);
-
-    await shieldWorker.init({
-      type: "init",
-      payload: {
-        rpcUrl,
-        token: token!,
-        maspIndexerUrl,
-      },
-    });
-
-    const shieldingMsgValue = new ShieldingTransferMsgValue({
-      target,
-      data: [
-        {
-          source: account?.address || "",
-          token: token!,
-          amount: BigNumber(amount),
-        },
-      ],
-    });
-
-    const publicKeyRevealed = await isPublicKeyRevealed(account!.address);
-    const msg: Shield = {
-      type: "shield",
-      payload: {
-        publicKeyRevealed,
-        account: account!,
-        gasConfig: {
-          gasLimit: BigNumber(50000),
-          gasPriceInMinDenom: BigNumber(0),
-          gasToken: "tnam1",
-        },
-        props: [shieldingMsgValue],
-        chain: chain!,
-      },
-    };
-
-    const { payload: encodedTx } = await shieldWorker.shield(msg);
-
-    const signedTxs = await signTx(encodedTx, account?.address || "");
-
-    await shieldWorker.broadcast({
-      type: "broadcast",
-      payload: {
-        encodedTxData: encodedTx,
-        signedTxs,
-      },
-    });
-
-    worker.terminate();
-  };
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (window as any).unshield = async (target: string, amount: number) => {
-    registerTransferHandlers();
-    const worker = new MaspTxWorker();
-    const shieldWorker = Comlink.wrap<MaspTxWorkerApi>(worker);
-
-    await shieldWorker.init({
-      type: "init",
-      payload: {
-        rpcUrl,
-        token: token!,
-        maspIndexerUrl,
-      },
-    });
-
-    const shieldingMsgValue = new UnshieldingTransferMsgValue({
-      source: shieldedAccount!.pseudoExtendedKey!,
-      gasSpendingKey: shieldedAccount!.pseudoExtendedKey!,
-      data: [
-        {
-          target,
-          token: token!,
-          amount: BigNumber(amount),
-        },
-      ],
-    });
-
-    const disposableSigner = (await refetch()).data;
-
-    const msg: Unshield = {
-      type: "unshield",
-      payload: {
-        account: {
-          ...account!,
-          publicKey: disposableSigner!.publicKey,
-        },
-        gasConfig: {
-          gasLimit: BigNumber(100000),
-          gasPriceInMinDenom: BigNumber(0),
-          gasToken: "tnam1",
-        },
-        props: [shieldingMsgValue],
-        chain: chain!,
-      },
-    };
-
-    const { payload: encodedTx } = await shieldWorker.unshield(msg);
-    const signedTxs = await signTx(encodedTx, disposableSigner?.address || "");
-
-    await shieldWorker.broadcast({
-      type: "broadcast",
-      payload: {
-        encodedTxData: encodedTx,
-        signedTxs,
-      },
-    });
-
-    worker.terminate();
-  };
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (window as any).shielded = async (target: string, amount: number) => {
-    registerTransferHandlers();
-    const worker = new MaspTxWorker();
-    const shieldWorker = Comlink.wrap<MaspTxWorkerApi>(worker);
-
-    await shieldWorker.init({
-      type: "init",
-      payload: {
-        rpcUrl,
-        token: token!,
-        maspIndexerUrl,
-      },
-    });
-
-    const shieldingMsgValue = new ShieldedTransferMsgValue({
-      gasSpendingKey: shieldedAccount!.pseudoExtendedKey!,
-      data: [
-        {
-          source: shieldedAccount!.pseudoExtendedKey!,
-          target,
-          token: token!,
-          amount: BigNumber(amount),
-        },
-      ],
-    });
-
-    const disposableSigner = (await refetch()).data;
-
-    const msg: ShieldedTransfer = {
-      type: "shielded-transfer",
-      payload: {
-        account: {
-          ...account!,
-          publicKey: disposableSigner!.publicKey,
-        },
-        gasConfig: {
-          gasLimit: BigNumber(50000),
-          gasPriceInMinDenom: BigNumber(0),
-          gasToken: "tnam1",
-        },
-        props: [shieldingMsgValue],
-        chain: chain!,
-      },
-    };
-
-    const { payload: encodedTx } = await shieldWorker.shieldedTransfer(msg);
-    const signedTxs = await signTx(encodedTx, disposableSigner?.address || "");
-
-    await shieldWorker.broadcast({
-      type: "broadcast",
-      payload: {
-        encodedTxData: encodedTx,
-        signedTxs,
-      },
-    });
-
-    worker.terminate();
-  };
-
-  return <div></div>;
-}
diff --git a/apps/namadillo/src/atoms/transfer/atoms.ts b/apps/namadillo/src/atoms/transfer/atoms.ts
index 4fe199da7..8dd557e2f 100644
--- a/apps/namadillo/src/atoms/transfer/atoms.ts
+++ b/apps/namadillo/src/atoms/transfer/atoms.ts
@@ -122,11 +122,6 @@ export const createUnshieldingTransferAtom = atomWithMutation((get) => {
       signer,
       memo,
     }: BuildTxAtomParams<UnshieldingTransferMsgValue>) => {
-      invariant(
-        signer,
-        "Disposable signer is required for unshielding transfers"
-      );
-
       await sync(
         allViewingKeys,
         chainId,
@@ -191,7 +186,7 @@ const sync = async (
   const { set } = getDefaultStore();
   await shieldedSync({
     rpcUrl,
-    maspIndexerUrl,
+    maspIndexerUrl: maspIndexerUrl || "",
     token: namTokenAddress,
     viewingKeys: allViewingKeys,
     chainId,
diff --git a/apps/namadillo/src/atoms/transfer/services.ts b/apps/namadillo/src/atoms/transfer/services.ts
index 09e6f62de..8c39d6949 100644
--- a/apps/namadillo/src/atoms/transfer/services.ts
+++ b/apps/namadillo/src/atoms/transfer/services.ts
@@ -199,15 +199,15 @@ export const createUnshieldingTransferTx = async (
   props: UnshieldingTransferMsgValue[],
   gasConfig: GasConfig,
   rpcUrl: string,
-  disposableSigner: GenDisposableSignerResponse,
+  signer?: GenDisposableSignerResponse,
   memo?: string
 ): Promise<EncodedTxData<UnshieldingTransferProps> | undefined> => {
-  const { publicKey: signerPublicKey } = disposableSigner;
-
   const source = props[0]?.source;
   const destination = props[0]?.data[0]?.target;
   const token = props[0]?.data[0]?.token;
   const amount = props[0]?.data[0]?.amount;
+  const accountWithSigner =
+    signer ? { ...account, publicKey: signer.publicKey } : account;
 
   let bparams: BparamsMsgValue[] | undefined;
 
@@ -231,10 +231,7 @@ export const createUnshieldingTransferTx = async (
       const msg: Unshield = {
         type: "unshield",
         payload: {
-          account: {
-            ...account,
-            publicKey: signerPublicKey,
-          },
+          account: accountWithSigner,
           gasConfig,
           props: [msgValue],
           chain,
diff --git a/apps/namadillo/src/hooks/useTransaction.tsx b/apps/namadillo/src/hooks/useTransaction.tsx
index 976acacfe..416fe96c0 100644
--- a/apps/namadillo/src/hooks/useTransaction.tsx
+++ b/apps/namadillo/src/hooks/useTransaction.tsx
@@ -42,7 +42,7 @@ export type UseTransactionPropsEvents<T> = {
 export type UseTransactionProps<T> = {
   params: T[];
   createTxAtom: AtomType<T>;
-  useDisposableSigner?: boolean;
+  canUseDisposableSigner?: boolean;
   eventType: TransactionEventsClasses;
   parsePendingTxNotification?: (tx: TransactionPair<T>) => PartialNotification;
   parseErrorTxNotification?: () => PartialNotification;
@@ -64,7 +64,7 @@ export type UseTransactionOutput<T> = {
 export const useTransaction = <T,>({
   params,
   createTxAtom,
-  useDisposableSigner,
+  canUseDisposableSigner,
   eventType,
   parsePendingTxNotification,
   parseErrorTxNotification,
@@ -121,6 +121,8 @@ export const useTransaction = <T,>({
           account?.address,
           "Extension not connected or no account is selected"
         );
+        const useDisposableSigner =
+          canUseDisposableSigner && feeProps.gasSource === "shielded";
 
         const txAdditionalParams = { ...additionalParams };
         if (useDisposableSigner) {
diff --git a/apps/namadillo/src/hooks/useTransactionFee.ts b/apps/namadillo/src/hooks/useTransactionFee.ts
index 93ddd2ae2..1500f1656 100644
--- a/apps/namadillo/src/hooks/useTransactionFee.ts
+++ b/apps/namadillo/src/hooks/useTransactionFee.ts
@@ -20,8 +20,11 @@ export type TransactionFeeProps = {
   isLoading: boolean;
   gasEstimate: GasEstimate | undefined;
   gasPriceTable: GasPriceTable | undefined;
+  gasSource: "shielded" | "transparent";
+  gasSourceSwitch: boolean;
   onChangeGasLimit: (value: BigNumber) => void;
   onChangeGasToken: (value: string) => void;
+  onChangeGasSource: (value: "shielded" | "transparent") => void;
 };
 
 export const useTransactionFee = (
@@ -32,7 +35,11 @@ export const useTransactionFee = (
   const [gasTokenValue, setGasTokenValue] = useState<string | undefined>();
   const userTransparentBalances = useAtomValue(transparentBalanceAtom);
   const userShieldedBalances = useAtomValue(shieldedBalanceAtom);
+  const [gasSource, setGasSource] = useState<"shielded" | "transparent">(
+    isShielded ? "shielded" : "transparent"
+  );
   const isPublicKeyRevealed = useAtomValue(isPublicKeyRevealedAtom);
+  const isShieldedSource = gasSource === "shielded";
 
   const { data: nativeToken, isLoading: isLoadingNativeToken } = useAtomValue(
     nativeTokenAddressAtom
@@ -75,17 +82,17 @@ export const useTransactionFee = (
   const availableGasTokenAddress = useMemo(() => {
     if (!gasPriceTable) return nativeToken;
 
-    if (isShielded && !userShieldedBalances.data) {
+    if (isShieldedSource && !userShieldedBalances.data) {
       return nativeToken;
     }
 
-    if (!isShielded && !userTransparentBalances.data) {
+    if (!isShieldedSource && !userTransparentBalances.data) {
       return nativeToken;
     }
 
     // Separate shielded amount from transparent
     const balances =
-      (isShielded ?
+      (isShieldedSource ?
         // TODO: we need to refactor userShieldedBalances to return Balance[] type instead
         userShieldedBalances.data?.map((balance) => ({
           minDenomAmount: balance.minDenomAmount,
@@ -123,7 +130,7 @@ export const useTransactionFee = (
     userShieldedBalances.data,
     gasPriceTable,
     gasDollarMap,
-    isShielded,
+    isShieldedSource,
   ]);
 
   const averageGasLimit = gasEstimate && BigNumber(gasEstimate.avg);
@@ -144,12 +151,19 @@ export const useTransactionFee = (
     isLoadingGasEstimate ||
     isLoadingGasPriceTable;
 
+  const gasSourceSwitch =
+    txKinds.includes("ShieldedTransfer") ||
+    txKinds.includes("UnshieldingTransfer");
+
   return {
     gasConfig,
     isLoading,
     gasEstimate,
     gasPriceTable,
+    gasSource,
+    gasSourceSwitch,
     onChangeGasLimit: setGasLimitValue,
     onChangeGasToken: setGasTokenValue,
+    onChangeGasSource: setGasSource,
   };
 };
diff --git a/apps/namadillo/src/hooks/useTransfer.ts b/apps/namadillo/src/hooks/useTransfer.ts
index 29ab3a27c..7a9127f5d 100644
--- a/apps/namadillo/src/hooks/useTransfer.ts
+++ b/apps/namadillo/src/hooks/useTransfer.ts
@@ -121,7 +121,7 @@ export const useTransfer = ({
         ],
       },
     ],
-    useDisposableSigner: true,
+    canUseDisposableSigner: true,
     ...commomProps,
   });
 
@@ -147,7 +147,7 @@ export const useTransfer = ({
         data: [{ target, token, amount: baseDenomAmount }],
       },
     ],
-    useDisposableSigner: true,
+    canUseDisposableSigner: true,
     ...commomProps,
   });