chore: Update v2 transfer module

apps/namadillo/package.json

@@ -10,7 +10,7 @@
     "@chain-registry/client": "^1.53.5",
     "@cosmjs/encoding": "^0.32.3",
     "@keplr-wallet/types": "^0.12.136",
-    "@namada/chain-registry": "^1.5.1",
+    "@namada/chain-registry": "^1.5.2",
     "@namada/indexer-client": "4.0.5",
     "@namada/sdk-multicore": "0.22.0",
     "@tailwindcss/container-queries": "^0.1.1",

apps/namadillo/src/App/AccountOverview/EstimateShieldingRewardsCard.tsx

@@ -3,7 +3,6 @@ import { ModalContainer } from "App/Common/ModalContainer";
 import { NamCurrency } from "App/Common/NamCurrency";
 import { MaspRewardCalculator } from "App/Sidebars/MaspRewardCalculator";
 import { cachedShieldedRewardsAtom } from "atoms/balance";
-import { applicationFeaturesAtom } from "atoms/settings";
 import clsx from "clsx";
 import { useAtomValue } from "jotai";
 import { useState } from "react";
@@ -12,7 +11,6 @@ import { FaCalculator } from "react-icons/fa6";
 export const EstimateShieldingRewardsCard = (): JSX.Element => {
   const shieldedRewards = useAtomValue(cachedShieldedRewardsAtom);
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const features = useAtomValue(applicationFeaturesAtom);
 
   const handleCloseModal = (): void => {
     setIsModalOpen(false);
@@ -47,18 +45,16 @@ export const EstimateShieldingRewardsCard = (): JSX.Element => {
             </div>
           }
         </span>
-        {features.shieldingRewardsEnabled && (
-          <div
-            className="group group/tooltip relative p-2 bg-black border border-yellow rounded-full cursor-pointer hover:bg-yellow hover:border-yellow transition-colors"
-            onClick={handleOpenModal}
-          >
-            <Tooltip position="top" className="w-[120px] text-center -mt-1">
-              Masp Rewards Calculator
-            </Tooltip>
+        <div
+          className="group group/tooltip relative p-2 bg-black border border-yellow rounded-full cursor-pointer hover:bg-yellow hover:border-yellow transition-colors"
+          onClick={handleOpenModal}
+        >
+          <Tooltip position="top" className="w-[120px] text-center -mt-1">
+            Masp Rewards Calculator
+          </Tooltip>
 
-            <FaCalculator className="text-3xl text-yellow group-hover:text-black p-1 transition-colors" />
-          </div>
-        )}
+          <FaCalculator className="text-3xl text-yellow group-hover:text-black p-1 transition-colors" />
+        </div>
       </div>
 
       {isModalOpen && (

apps/namadillo/src/App/AccountOverview/UnshieldedAssetTable.tsx

@@ -4,20 +4,21 @@ import {
   TableRow,
   Tooltip,
 } from "@namada/components";
+import { AccountType } from "@namada/types";
 import { AtomErrorBoundary } from "App/Common/AtomErrorBoundary";
 import { FiatCurrency } from "App/Common/FiatCurrency";
 import { TableWithPaginator } from "App/Common/TableWithPaginator";
 import { TokenCard } from "App/Common/TokenCard";
 import { TokenCurrency } from "App/Common/TokenCurrency";
 import { params, routes } from "App/routes";
+import { allDefaultAccountsAtom } from "atoms/accounts";
 import { transparentTokensAtom } from "atoms/balance/atoms";
 import { tokenPricesFamily } from "atoms/prices/atoms";
 import { applicationFeaturesAtom } from "atoms/settings";
 import { useBalances } from "hooks/useBalances";
 import { useAtomValue } from "jotai";
 import { useEffect, useMemo, useState } from "react";
 import { IoSwapHorizontal } from "react-icons/io5";
-import { TbVectorTriangle } from "react-icons/tb";
 import { Link } from "react-router-dom";
 import { twMerge } from "tailwind-merge";
 import { TokenBalance } from "types";
@@ -35,6 +36,15 @@ const TransparentTokensTable = ({
   const [page, setPage] = useState(initialPage);
   const { namTransfersEnabled } = useAtomValue(applicationFeaturesAtom);
   const { bondedAmount } = useBalances();
+  const { data: accounts } = useAtomValue(allDefaultAccountsAtom);
+  const transparentAccount = accounts?.find(
+    (account) => account.type !== AccountType.ShieldedKeys
+  );
+  const shieldedAccount = accounts?.find(
+    (account) => account.type === AccountType.ShieldedKeys
+  );
+  const shieldedAddress = shieldedAccount?.address;
+  const destinationAddress = transparentAccount?.address;
 
   // Get token prices for calculating staked balance dollar amounts
   const tokenAddresses = useMemo(
@@ -102,7 +112,7 @@ const TransparentTokensTable = ({
             <div className="relative group/tooltip">
               <ActionButton
                 size="xs"
-                href={`${routes.shield}?${params.asset}=${address}`}
+                href={`${routes.maspShield}?${params.asset}=${asset.symbol}&${params.source}=${destinationAddress}&${params.destination}=${shieldedAddress}`}
               >
                 Shield
               </ActionButton>
@@ -128,12 +138,6 @@ const TransparentTokensTable = ({
                   url: `${routes.transfer}?${params.asset}=${address}&${params.shielded}=0`,
                   icon: <IoSwapHorizontal className="h-[20px] w-[20px]" />,
                 },
-                {
-                  url: `${routes.ibcWithdraw}?${params.asset}=${address}`,
-                  icon: (
-                    <TbVectorTriangle className="h-[20px] w-[20px] -mt-1" />
-                  ),
-                },
               ].map(({ url, icon }) => (
                 <div key={url} className="relative group/tooltip">
                   <Link

apps/namadillo/src/App/AppRoutes.tsx

@@ -21,13 +21,6 @@ import { SubmitVote } from "./Governance/SubmitVote";
 import { ViewJson } from "./Governance/ViewJson";
 import { IbcLayout } from "./Ibc/IbcLayout";
 import { IbcShieldAll } from "./Ibc/IbcShieldAll";
-import { IbcTransfer } from "./Ibc/IbcTransfer";
-import { IbcTransfersLayout } from "./Ibc/IbcTransfersLayout";
-import { IbcWithdraw } from "./Ibc/IbcWithdraw";
-import { MaspLayout } from "./Masp/MaspLayout";
-import { MaspShield } from "./Masp/MaspShield";
-import { MaspUnshield } from "./Masp/MaspUnshield";
-import { NamadaTransfer } from "./NamadaTransfer/NamadaTransfer";
 import { routes } from "./routes";
 import { Advanced } from "./Settings/Advanced";
 import { EnableFeatures } from "./Settings/EnableFeatures";
@@ -46,6 +39,7 @@ import { Unstake } from "./Staking/Unstake";
 import { SwitchAccountPanel } from "./SwitchAccount/SwitchAccountPanel";
 import { TransactionDetails } from "./Transactions/TransactionDetails";
 import { TransactionHistory } from "./Transactions/TransactionHistory";
+import { ReceiveCard } from "./Transfer";
 import { TransferLayout } from "./Transfer/TransferLayout";
 
 export const MainRoutes = (): JSX.Element => {
@@ -69,7 +63,6 @@ export const MainRoutes = (): JSX.Element => {
         >
           {/* Home */}
           <Route index element={<AccountOverview />} />
-
           {/* Staking */}
           <Route path={routes.staking} element={<StakingOverview />} />
           <Route
@@ -81,7 +74,8 @@ export const MainRoutes = (): JSX.Element => {
             path={routes.stakingBondingRedelegate}
             element={<ReDelegate />}
           />
-
+          {/* Receive */}
+          <Route path={routes.receive} element={<ReceiveCard />} />
           {/* Governance */}
           <Route path={routes.governance} element={<GovernanceOverview />} />
           <Route
@@ -91,34 +85,19 @@ export const MainRoutes = (): JSX.Element => {
           <Route path={routes.governanceSubmitVote} element={<SubmitVote />} />
           <Route path={routes.governanceJson} element={<ViewJson />} />
 
-          {/* Masp */}
-          {features.maspEnabled && (
-            <Route element={<MaspLayout />}>
-              <Route path={routes.shield} element={<MaspShield />} />
-              <Route path={routes.unshield} element={<MaspUnshield />} />
-            </Route>
-          )}
-
-          {/* Ibc Transfers */}
-          {features.ibcTransfersEnabled && (
-            <Route element={<IbcTransfersLayout />}>
-              <Route path={routes.ibc} element={<IbcTransfer />} />
-              <Route path={routes.ibcWithdraw} element={<IbcWithdraw />} />
-            </Route>
-          )}
-
           {features.ibcTransfersEnabled && (
             <Route element={<IbcLayout />}>
               <Route path={routes.ibcShieldAll} element={<IbcShieldAll />} />
             </Route>
           )}
-
-          {/* Transfer */}
-          {(features.maspEnabled || features.namTransfersEnabled) && (
-            <Route element={<TransferLayout />}>
-              <Route path={routes.transfer} element={<NamadaTransfer />} />
-            </Route>
-          )}
+          {/* Transfer - All transfer types now handled by TransferLayout */}
+          <Route element={<TransferLayout />}>
+            <Route path={routes.transfer} element={<div />} />
+            <Route path={routes.ibc} element={<div />} />
+            <Route path={routes.ibcWithdraw} element={<div />} />
+            <Route path={routes.maspShield} element={<div />} />
+            <Route path={routes.maspUnshield} element={<div />} />
+          </Route>
 
           {/* Transaction History */}
           {(features.namTransfersEnabled || features.ibcTransfersEnabled) && (
@@ -130,7 +109,6 @@ export const MainRoutes = (): JSX.Element => {
               />
             </Route>
           )}
-
           {/* Other */}
           <Route path={routes.bugReport} element={<BugReport />} />
           <Route path="*" element={<NotFound />} />

apps/namadillo/src/App/Common/SelectModal.tsx

@@ -31,7 +31,7 @@ export const SelectModal = ({
           )}
           {...props}
         >
-          <header className="flex w-full justify-center items-center relative mb-6 text-light leading-8">
+          <header className="flex w-full justify-center items-center relative mb-6 text-light leading-8 flex-shrink-0">
             {title}
             <i
               className="cursor-pointer text-white absolute -right-2.5 text-xl p-1.5 hover:text-yellow z-50"
@@ -40,7 +40,7 @@ export const SelectModal = ({
               <IoClose />
             </i>
           </header>
-          {children}
+          <div className="flex-1 overflow-hidden">{children}</div>
         </div>
       </ModalTransition>
     </Modal>

apps/namadillo/src/App/Common/SidebarMenuItem.tsx

@@ -24,7 +24,7 @@ export const SidebarMenuItem = ({ url, children }: Props): JSX.Element => {
       to={url}
       className={({ isActive }) =>
         clsx(className, {
-          "text-yellow font-bold": isActive,
+          "text-yellow font-bold pointer-events-none select-none": isActive,
         })
       }
     >

apps/namadillo/src/App/Common/TransactionFee.tsx

@@ -11,8 +11,10 @@ export const TransactionFee = ({
   symbol,
 }: TransactionFeeProps): JSX.Element => {
   return (
-    <div className="flex items-center gap-2">
-      <span className="text-xs leading-none text-neutral-500">Fee:</span>
+    <div className="flex w-full gap-2">
+      <span className="text-sm mt-[3px] ml-1 underline leading-none text-neutral-300">
+        Transaction Fee
+      </span>
       <TokenCurrency
         symbol={symbol}
         amount={displayAmount}

apps/namadillo/src/App/Common/TransactionFeeButton.tsx

@@ -43,7 +43,7 @@ export const TransactionFeeButton = ({
           symbol={gasDisplayAmount?.asset.symbol || ""}
         />
         <div className="flex items-center gap-2">
-          <div className="text-neutral-500 text-xs">Fee Options:</div>
+          <div className="text-neutral-500 text-xs">Fees:</div>
           <button
             type="button"
             className={twMerge(

apps/namadillo/src/App/Common/TransactionReceipt.tsx

@@ -80,11 +80,6 @@ const TransferTransactionReceipt = ({
       wallets.namada
     : wallets.keplr;
 
-  const destinationWallet =
-    isNamadaAddress(transaction.destinationAddress || "") ?
-      wallets.namada
-    : wallets.keplr;
-
   return (
     <Stack className="max-w-[440px] mx-auto">
       <div className="rounded-md bg-neutral-800 px-4 pb-6">
@@ -97,7 +92,6 @@ const TransferTransactionReceipt = ({
           )}
           {sourceWallet && (
             <SelectedWallet
-              wallet={sourceWallet}
               address={
                 isExtendedKey(transaction.sourceAddress || "") ?
                   getEncodedViewingKey(transaction.sourceAddress || "")
@@ -136,12 +130,7 @@ const TransferTransactionReceipt = ({
                 iconSize="36px"
               />
             )}
-            {destinationWallet && (
-              <SelectedWallet
-                wallet={destinationWallet}
-                address={transaction.destinationAddress}
-              />
-            )}
+            <SelectedWallet address={transaction.destinationAddress} />
           </div>
         </footer>
       </div>

apps/namadillo/src/App/Common/UnshieldAssetsModal.tsx

@@ -39,7 +39,7 @@ export const UnshieldAssetsModal = ({
               <img src={getAssetImageUrl(namadaAsset())} className="w-full" />
             </span>
           ),
-          onClick: () => goTo(routes.unshield),
+          onClick: () => goTo(routes.maspUnshield),
           children:
             "Unshield assets from your Namada shielded to transparent account",
         },

apps/namadillo/src/App/Ibc/IbcShieldAll.tsx

@@ -2,7 +2,6 @@ import { Chain } from "@chain-registry/types";
 import { Panel } from "@namada/components";
 import { useAssetAmount } from "hooks/useAssetAmount";
 import { useWalletManager } from "hooks/useWalletManager";
-import { wallets } from "integrations";
 import { KeplrWalletManager } from "integrations/Keplr";
 import { useState } from "react";
 import { Asset } from "types";
@@ -41,7 +40,6 @@ export const IbcShieldAll: React.FC = () => {
       {connected && !isSuccess && (
         <ShieldAllPanel
           registry={registry}
-          wallet={wallets.keplr}
           walletAddress={walletAddress}
           assetList={Object.values(assetsBalances || [])}
           isLoading={isLoadingBalances}