From e5d950ea4f5fd633569fc929daec517bfa6a7807 Mon Sep 17 00:00:00 2001
From: neocybereth <sean@arrowburn.co.nz>
Date: Tue, 11 Nov 2025 10:24:15 +1300
Subject: [PATCH 1/3] fix: update top headers

---
 apps/namadillo/src/App/Masp/MaspShield.tsx             |  8 ++------
 apps/namadillo/src/App/Masp/MaspUnshield.tsx           |  8 ++------
 .../src/App/NamadaTransfer/NamadaTransfer.tsx          | 10 ++--------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/apps/namadillo/src/App/Masp/MaspShield.tsx b/apps/namadillo/src/App/Masp/MaspShield.tsx
index e5ada33c16..05fd4d0ca4 100644
--- a/apps/namadillo/src/App/Masp/MaspShield.tsx
+++ b/apps/namadillo/src/App/Masp/MaspShield.tsx
@@ -1,6 +1,5 @@
 import { Panel } from "@namada/components";
 import { AccountType } from "@namada/types";
-import { NamadaTransferTopHeader } from "App/NamadaTransfer/NamadaTransferTopHeader";
 import { TransferModule } from "App/Transfer/TransferModule";
 import { OnSubmitTransferParams } from "App/Transfer/types";
 import { allDefaultAccountsAtom } from "atoms/accounts";
@@ -148,11 +147,8 @@ export const MaspShield = ({
 
   return (
     <Panel className="rounded-sm flex flex-col flex-1 py-9">
-      <header className="flex flex-col items-center text-center mb-8 gap-6">
-        <NamadaTransferTopHeader
-          isSourceShielded={false}
-          isDestinationShielded={true}
-        />
+      <header className="flex flex-col text-yellow items-center text-center mb-8 gap-6">
+        Shield Assets
       </header>
       <TransferModule
         source={{
diff --git a/apps/namadillo/src/App/Masp/MaspUnshield.tsx b/apps/namadillo/src/App/Masp/MaspUnshield.tsx
index eadf2ad1c3..9491465744 100644
--- a/apps/namadillo/src/App/Masp/MaspUnshield.tsx
+++ b/apps/namadillo/src/App/Masp/MaspUnshield.tsx
@@ -1,6 +1,5 @@
 import { Panel } from "@namada/components";
 import { MaspSyncCover } from "App/Common/MaspSyncCover";
-import { NamadaTransferTopHeader } from "App/NamadaTransfer/NamadaTransferTopHeader";
 import { TransferModule } from "App/Transfer/TransferModule";
 import { OnSubmitTransferParams } from "App/Transfer/types";
 import { lastCompletedShieldedSyncAtom } from "atoms/balance/atoms";
@@ -133,11 +132,8 @@ export const MaspUnshield = ({
 
   return (
     <Panel className="relative rounded-sm flex flex-col flex-1 pt-9">
-      <header className="flex flex-col items-center text-center mb-8 gap-6">
-        <NamadaTransferTopHeader
-          isSourceShielded={true}
-          isDestinationShielded={false}
-        />
+      <header className="flex flex-col text-yellow items-center text-center mb-8 gap-6">
+        Unshield Assets
       </header>
       <TransferModule
         source={{
diff --git a/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx b/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
index fe640c6a43..f1d9df4339 100644
--- a/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
+++ b/apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx
@@ -18,7 +18,6 @@ import { createTransferDataFromNamada } from "lib/transactions";
 import { useMemo, useState } from "react";
 import { useSearchParams } from "react-router-dom";
 import { AssetWithAmountAndChain } from "types";
-import { NamadaTransferTopHeader } from "./NamadaTransferTopHeader";
 
 interface NamadaTransferProps {
   sourceAddress: string;
@@ -165,13 +164,8 @@ export const NamadaTransfer = ({
 
   return (
     <Panel className="min-h-[600px] rounded-sm flex flex-col flex-1 py-9">
-      <header className="flex flex-col items-center text-center mb-8 gap-6">
-        <NamadaTransferTopHeader
-          isSourceShielded={isSourceShielded}
-          isDestinationShielded={
-            destinationAddress ? isTargetShielded : undefined
-          }
-        />
+      <header className="flex flex-col text-yellow items-center text-center mb-8 gap-6">
+        {`${isSourceShielded ? "Shielded" : "Transparent"} Transfer Assets`}
       </header>
       <TransferModule
         source={{

From 9f0d08f97064f455c9d5deec95670585bbe96751 Mon Sep 17 00:00:00 2001
From: neocybereth <sean@arrowburn.co.nz>
Date: Wed, 12 Nov 2025 14:02:52 +1300
Subject: [PATCH 2/3] fix: remove keplr requirement to receive to an IBC addy

---
 .../src/App/Transfer/TransferDestination.tsx  | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/apps/namadillo/src/App/Transfer/TransferDestination.tsx b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
index a0883750d2..4062b54055 100644
--- a/apps/namadillo/src/App/Transfer/TransferDestination.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferDestination.tsx
@@ -12,13 +12,11 @@ import {
   isTransparentAddress,
 } from "App/Transfer/common";
 import { allDefaultAccountsAtom } from "atoms/accounts";
-import { connectedWalletsAtom } from "atoms/integrations";
 import { getAddressLabel } from "atoms/transfer/functions";
 import BigNumber from "bignumber.js";
 import clsx from "clsx";
 import { TransactionFeeProps } from "hooks/useTransactionFee";
 import { wallets } from "integrations";
-import { KeplrWalletManager } from "integrations/Keplr";
 import { getChainFromAddress, getChainImageUrl } from "integrations/utils";
 import { useAtomValue } from "jotai";
 import { useCallback, useEffect, useState } from "react";
@@ -51,7 +49,6 @@ type TransferDestinationProps = {
   sourceAsset: Asset | undefined;
   onChangeAddress?: (address: Address) => void;
   onChangeMemo?: (address: string) => void;
-  setDestinationAddress?: (address: string) => void;
 };
 
 export const TransferDestination = ({
@@ -67,14 +64,12 @@ export const TransferDestination = ({
   sourceAddress,
   memo,
   sourceAsset,
-  setDestinationAddress,
+  onChangeAddress,
   onChangeMemo,
 }: TransferDestinationProps): JSX.Element => {
   const { data: accounts } = useAtomValue(allDefaultAccountsAtom);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const location = useLocation();
-  const connectedWallets = useAtomValue(connectedWalletsAtom);
-  const keplr = new KeplrWalletManager();
 
   const isIbcTransfer = isIbcAddress(sourceAddress ?? "");
   const changeFeeEnabled = !isIbcTransfer;
@@ -99,36 +94,24 @@ export const TransferDestination = ({
   };
 
   const handleSelectAddress = useCallback(
-    async (selectedAddress: Address): Promise<void> => {
-      const isIbcAsset = !isNamadaAddress(selectedAddress);
-      if (isIbcAsset) {
-        await keplr.connectAllKeplrChains();
-      }
-      setDestinationAddress?.(selectedAddress);
-    },
-    [keplr, setDestinationAddress]
+    (selectedAddress: Address): void => onChangeAddress?.(selectedAddress),
+    [onChangeAddress]
   );
 
   const isShieldingTransaction =
     routes.shield === location.pathname || routes.ibc === location.pathname;
 
-  // Make sure destination address isnt ibc if keplr is not connected
-  useEffect(() => {
-    if (isIbcAddress(destinationAddress ?? "") && !connectedWallets.keplr)
-      setDestinationAddress?.("");
-  }, [connectedWallets.keplr, destinationAddress, setDestinationAddress]);
-
   // Make sure destination address is pre-filled if it's a shielding transaction
   useEffect(() => {
     if (destinationAddress) return;
     if (isShieldingTransaction && shieldedAccount?.address) {
-      setDestinationAddress?.(shieldedAccount?.address ?? "");
+      onChangeAddress?.(shieldedAccount?.address ?? "");
     }
   }, [
     isShieldingTransaction,
     shieldedAccount?.address,
     destinationAddress,
-    setDestinationAddress,
+    onChangeAddress,
   ]);
 
   // Write a customAddress variable that checks if the address doesn't come from our transparent or shielded accounts

From d969febe4f80b89e89b7d88ec60be1c0516b720e Mon Sep 17 00:00:00 2001
From: neocybereth <sean@arrowburn.co.nz>
Date: Wed, 12 Nov 2025 14:10:29 +1300
Subject: [PATCH 3/3] fix: cleanu pprops

---
 apps/namadillo/src/App/Transfer/TransferModule.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/namadillo/src/App/Transfer/TransferModule.tsx b/apps/namadillo/src/App/Transfer/TransferModule.tsx
index 3f509304a8..4004506ce9 100644
--- a/apps/namadillo/src/App/Transfer/TransferModule.tsx
+++ b/apps/namadillo/src/App/Transfer/TransferModule.tsx
@@ -213,7 +213,6 @@ export const TransferModule = ({
             />
           </i>
           <TransferDestination
-            setDestinationAddress={destination.onChangeAddress}
             isShieldedAddress={isShieldedAddress(destinationAddress)}
             isShieldedTx={isShieldedTx}
             destinationAddress={destinationAddress}