Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
f0c98ba
fix: cleanup
neocybereth May 18, 2025
f4367aa
fix: placeholder
neocybereth May 22, 2025
e6c19ab
fix: updates to module
neocybereth May 23, 2025
85ccac9
fix: cleanup
neocybereth May 23, 2025
4aab286
fix: clean up card
neocybereth May 23, 2025
90b7e0a
fix: remove svg and update to icon
neocybereth May 25, 2025
33460a8
fix: cleanup token selector
neocybereth Jun 10, 2025
99bc7da
chore: add selector for all networks and keep it highlighted
neocybereth Jun 10, 2025
105c117
fix: linting
neocybereth Jun 10, 2025
d9756aa
fix: update scrolling
neocybereth Jun 24, 2025
ad13165
fix: cleanup
neocybereth Jun 24, 2025
b515ad9
fix: cleaup
neocybereth Jun 26, 2025
5b81e6e
fix: cleanup transfer destination and update left side panel
neocybereth Jun 26, 2025
e4bf0a6
fix: complete siderb ar
neocybereth Jun 26, 2025
c2ee332
fix: cleanup
neocybereth Jun 30, 2025
45d102c
fix: cleanup
neocybereth Jul 1, 2025
abbea5a
fix: cleanup
neocybereth Jul 2, 2025
ca13332
fix: update icons on source
neocybereth Jul 2, 2025
31dd850
fix: styling in source module
neocybereth Jul 2, 2025
6bd7514
fix: remove token example
neocybereth Jul 2, 2025
7bb95c3
fix: mild cleanup
neocybereth Jul 2, 2025
2cc917b
fix: clear amount input
neocybereth Jul 2, 2025
f8bfb03
fix: separate types
neocybereth Jul 3, 2025
6ce695f
fix: cleanup
neocybereth Jul 3, 2025
5a0c326
fix: more cleanup
neocybereth Jul 3, 2025
ad9977b
chore: abstract away and cleanup
neocybereth Jul 3, 2025
48b79b9
fix: cleanup
neocybereth Jul 3, 2025
8534a9f
fix: various cleanups
neocybereth Jul 3, 2025
befafd3
fix: reinstate
neocybereth Jul 3, 2025
f438416
fix: get wallet dropdown working
neocybereth Jul 3, 2025
e3055e4
fix: mega cleanup
neocybereth Jul 3, 2025
3cca679
fix: cleanup
neocybereth Jul 8, 2025
30ce515
chore: validator for source
neocybereth Jul 9, 2025
95a8059
fix: remove shielding option on shielding txn
neocybereth Jul 9, 2025
1c415d9
fix: design overhaul
neocybereth Jul 9, 2025
0cdff88
chore: transfer resolver
neocybereth Jul 10, 2025
f434b5e
fix: clean
neocybereth Jul 10, 2025
c41d3d1
fix: back to equilibrium
neocybereth Jul 10, 2025
97b7859
fix: its a miracle
neocybereth Jul 11, 2025
6aacf61
fix: cleanup
neocybereth Jul 11, 2025
00a48e9
fix: yo
neocybereth Jul 13, 2025
f44a8ba
fix: checkpoint
neocybereth Jul 13, 2025
4b0a65f
fix: slog
neocybereth Jul 14, 2025
f82ba86
fix: address dropdown and such
neocybereth Jul 14, 2025
f728580
cleanup
neocybereth Jul 14, 2025
c22f518
cleanup
neocybereth Jul 14, 2025
dd089fb
fix: transaction melding chaos
neocybereth Jul 14, 2025
de591f7
cleanup
neocybereth Jul 15, 2025
9155e85
fix: cleaning up the chaos
neocybereth Jul 16, 2025
9ccb518
cleanup
neocybereth Jul 16, 2025
6ec8e0b
clean
neocybereth Jul 16, 2025
deb4399
add keplr addy in top logo tooltip
neocybereth Jul 17, 2025
f83bbe2
fixes
neocybereth Jul 17, 2025
944de8c
major cleanup
neocybereth Jul 17, 2025
ab47379
EXPERIMENTAL CHECKPOINT
neocybereth Jul 17, 2025
3f821e6
i did it holy smokes
neocybereth Jul 17, 2025
616cbb9
absolutely cooking with gas folks
neocybereth Jul 17, 2025
fbb5a05
clean up of Namada Transfer
neocybereth Jul 17, 2025
0f005f4
mega cleanup all components done
neocybereth Jul 17, 2025
b568472
what a frikkin miracle
neocybereth Jul 17, 2025
9914d16
cleanup
neocybereth Jul 17, 2025
2465d2d
new architecture
neocybereth Jul 18, 2025
9faee98
cleanup tweaks
neocybereth Jul 18, 2025
67d390a
core base
neocybereth Jul 18, 2025
7c21748
fix: add back spacing
neocybereth Jul 18, 2025
644fd43
fix: cleanup sidebar nav
neocybereth Jul 18, 2025
55a8ab5
fix: cleanup
neocybereth Jul 18, 2025
e170d8a
cleanup
neocybereth Jul 18, 2025
61637e0
fix: cleanup components and organize
neocybereth Jul 18, 2025
faf863d
cleanup token select
neocybereth Jul 18, 2025
1d33559
fix: goofy select token fix,dk how I feel about it
neocybereth Jul 18, 2025
ca0b43e
revert
neocybereth Jul 18, 2025
c74b578
fix: cleanup
neocybereth Jul 21, 2025
7ea512b
fix and keplr wallet manager sharing
neocybereth Jul 22, 2025
cda86be
cleanup
neocybereth Jul 22, 2025
f6c51d4
get ibc shielding workin
neocybereth Jul 22, 2025
d1f4482
update side menu
neocybereth Jul 22, 2025
bb76d35
various fixes
neocybereth Jul 22, 2025
83d802d
fix: remove old ways extra funcs
neocybereth Jul 23, 2025
22a108a
fix: variables
neocybereth Jul 23, 2025
49ccc46
fix: types
neocybereth Jul 23, 2025
1c1dd80
fix: simplify address dropdown
neocybereth Jul 23, 2025
cdacc8a
fix: address dropdown
neocybereth Jul 24, 2025
014642e
fix: update address dropdown to show alias instead of address
neocybereth Jul 27, 2025
88aa504
fix: add keplr alias
neocybereth Jul 29, 2025
df2b3d6
fix: adding ibc addy
neocybereth Jul 29, 2025
b69c898
fix: deps
neocybereth Jul 29, 2025
93ff76c
fix: cleanup
neocybereth Jul 29, 2025
c8f67ee
fix: cleanup
neocybereth Jul 29, 2025
67df35f
fix: cleanup
neocybereth Jul 29, 2025
7e390c0
fix: cleanup
neocybereth Jul 29, 2025
6ce80c8
fix: update destination and downgrade packages
neocybereth Jul 29, 2025
564ed8c
fix: minor fixes
neocybereth Jul 29, 2025
88fd90c
fix: prevent auto request
neocybereth Jul 31, 2025
7a872b4
fix: prevent auto request
neocybereth Jul 31, 2025
e5a9065
fix: remove yarn
neocybereth Jul 31, 2025
12adf35
fix: update link tracking state and ibc gas errorr
neocybereth Jul 31, 2025
dcc0051
fix: cleanup
neocybereth Jul 31, 2025
112dc08
fix: update sidebar
neocybereth Aug 1, 2025
bfa11dc
fix: set default account
neocybereth Aug 1, 2025
fe6239f
fix: fix popup on select token when changing routes
neocybereth Aug 4, 2025
e0d5c18
fix: clean up code that determines what ibc addresses we can transfer to
neocybereth Aug 4, 2025
54289c2
fix: update URL with asset
neocybereth Aug 4, 2025
8e3a464
fix: cleanup for ibc transfers
neocybereth Aug 5, 2025
6794553
fix: update submitting txn view
neocybereth Aug 5, 2025
c6da53f
fix: cleanup for fees
neocybereth Aug 5, 2025
32c4f9c
fix: cleanup transaction receipt
neocybereth Aug 5, 2025
22a633e
fix: cleanup
neocybereth Aug 5, 2025
7dc24e6
fix: tests
neocybereth Aug 5, 2025
5194eb2
fix: tests
neocybereth Aug 5, 2025
2321109
fix: types
neocybereth Aug 5, 2025
488ca42
fix: update destination address modal
neocybereth Aug 6, 2025
153a3e7
fix: allow NAM to be sent to osmosis
neocybereth Aug 6, 2025
0ad4de8
fix: cleanup select token
neocybereth Aug 6, 2025
8c3d9e1
fix: show selected account
neocybereth Aug 6, 2025
3592dc1
fix: cleanup keplr asset transfer destination
neocybereth Aug 7, 2025
aa0aba5
fix: cleanup
neocybereth Aug 7, 2025
8676ac1
fix: prevent reusing same link on sidebar
neocybereth Aug 7, 2025
def221e
fix: dont allow sending from/to same address
neocybereth Aug 18, 2025
3e23a58
fix: pr review fixes
neocybereth Aug 25, 2025
aa88798
fix: cleanup
neocybereth Aug 25, 2025
7074567
fix: cleanup
neocybereth Aug 25, 2025
eaf2715
fix: cleanup early popup
neocybereth Aug 26, 2025
2831856
fix: dont popup single chain connection on address modal
neocybereth Aug 26, 2025
16118de
fix: make sure destination address isnt ibc if keplr not connected
neocybereth Aug 26, 2025
92472f6
fix: connect all keplr chains upon destination select
neocybereth Aug 26, 2025
6843ae1
fix: add connect all keplr chains helper
neocybereth Aug 26, 2025
bc95aa5
fix: update privacy tooltip
neocybereth Aug 26, 2025
e2e8539
fix: remove annoying console error
neocybereth Sep 4, 2025
7aaada1
fix: clear other annoying error
neocybereth Sep 4, 2025
0ae978e
fix: update nam
neocybereth Sep 10, 2025
01fbabd
fix: remove assets with no balance on keplr
neocybereth Sep 10, 2025
4c63ae8
feat: add square chain icons (#2302)
euharrison Oct 12, 2025
c700170
fix: fix network select
neocybereth Oct 14, 2025
1fa8db7
fix: namada transparent image in receipt
neocybereth Oct 14, 2025
48013c7
fix: remove test
neocybereth Oct 28, 2025
d7f1ac1
fix: update chain checking
neocybereth Oct 28, 2025
a1ff0c8
fix: console clan
neocybereth Oct 28, 2025
df57b8b
fix: update IBC to shielded namada useIbc hook
neocybereth Oct 29, 2025
00f0ff1
fix: cleanup network and update to new chain registry
neocybereth Oct 29, 2025
d004e59
fix: cleanup network and update to new chain registry
neocybereth Oct 29, 2025
5f93966
fix: ibc in transfer v2 (#2314)
mateuszjasiuk Oct 30, 2025
b10a62d
chore: review feedback
neocybereth Nov 2, 2025
e71c59e
fix: update naviagaiton icon colors
neocybereth Nov 2, 2025
fdaabe8
fix: clean
neocybereth Nov 2, 2025
440e9f0
chore: review
neocybereth Nov 2, 2025
dd1887e
fix: fix for shielding and unshielding tables to re-route to /transfer
neocybereth Nov 2, 2025
8b087c1
fix: fix source test
neocybereth Nov 2, 2025
7d5fed9
chore: cleanup after review and centralize amounts
neocybereth Nov 3, 2025
ec78b98
fix: update routing
neocybereth Nov 3, 2025
5b0ba1d
fix: remove ?
neocybereth Nov 3, 2025
e7fb88b
fix: add housefire chain
neocybereth Nov 3, 2025
c3b468e
fix: update to bignumber
neocybereth Nov 3, 2025
0c8f034
fix: allChains atom
neocybereth Nov 3, 2025
006fc49
fix: cleanup
neocybereth Nov 3, 2025
0ab8c64
fix: return
neocybereth Nov 3, 2025
7c3a4c1
fix: remove fallback
neocybereth Nov 3, 2025
ae11f8b
fix: last bits of review
neocybereth Nov 3, 2025
f6f93a6
fix: reset display amount after successful tx
neocybereth Nov 3, 2025
4232a96
fix: move addy label
neocybereth Nov 3, 2025
8d51334
fix: fix filtering in SelectToken
neocybereth Nov 3, 2025
c5ae051
fix: types cleanup
neocybereth Nov 3, 2025
a2c6972
fix: cleanup types
neocybereth Nov 3, 2025
710e970
fix: tupes
neocybereth Nov 3, 2025
df63c97
fix: underline available balance so it feels clickable
neocybereth Nov 4, 2025
9d49501
fix: add keplr logo
neocybereth Nov 4, 2025
af246f7
fix: handle amount issue and transaction receipt
neocybereth Nov 4, 2025
0cce00e
fix: when extension changes clear target addy
neocybereth Nov 4, 2025
bbd1809
fix: merge commits from mateusz fixes
neocybereth Nov 5, 2025
b861c2e
fix: keep state on refresh
neocybereth Nov 5, 2025
345e273
fix: check for keplr/keychain addresses and if not present then refre…
neocybereth Nov 5, 2025
0ee1b38
chore: bump registry and change gas price default to low
mateuszjasiuk Nov 5, 2025
8d6b41a
fix: check if accounts are defined when resetting url
mateuszjasiuk Nov 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/namadillo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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);
Expand Down Expand Up @@ -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 && (
Expand Down
20 changes: 12 additions & 8 deletions apps/namadillo/src/App/AccountOverview/UnshieldedAssetTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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(
Expand Down Expand Up @@ -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>
Expand All @@ -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
Expand Down
44 changes: 11 additions & 33 deletions apps/namadillo/src/App/AppRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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 => {
Expand All @@ -69,7 +63,6 @@ export const MainRoutes = (): JSX.Element => {
>
{/* Home */}
<Route index element={<AccountOverview />} />

{/* Staking */}
<Route path={routes.staking} element={<StakingOverview />} />
<Route
Expand All @@ -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
Expand All @@ -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) && (
Expand All @@ -130,7 +109,6 @@ export const MainRoutes = (): JSX.Element => {
/>
</Route>
)}

{/* Other */}
<Route path={routes.bugReport} element={<BugReport />} />
<Route path="*" element={<NotFound />} />
Expand Down
4 changes: 2 additions & 2 deletions apps/namadillo/src/App/Common/SelectModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -40,7 +40,7 @@ export const SelectModal = ({
<IoClose />
</i>
</header>
{children}
<div className="flex-1 overflow-hidden">{children}</div>
</div>
</ModalTransition>
</Modal>
Expand Down
2 changes: 1 addition & 1 deletion apps/namadillo/src/App/Common/SidebarMenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
}
>
Expand Down
6 changes: 4 additions & 2 deletions apps/namadillo/src/App/Common/TransactionFee.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion apps/namadillo/src/App/Common/TransactionFeeButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 1 addition & 12 deletions apps/namadillo/src/App/Common/TransactionReceipt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -97,7 +92,6 @@ const TransferTransactionReceipt = ({
)}
{sourceWallet && (
<SelectedWallet
wallet={sourceWallet}
address={
isExtendedKey(transaction.sourceAddress || "") ?
getEncodedViewingKey(transaction.sourceAddress || "")
Expand Down Expand Up @@ -136,12 +130,7 @@ const TransferTransactionReceipt = ({
iconSize="36px"
/>
)}
{destinationWallet && (
<SelectedWallet
wallet={destinationWallet}
address={transaction.destinationAddress}
/>
)}
<SelectedWallet address={transaction.destinationAddress} />
</div>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/namadillo/src/App/Common/UnshieldAssetsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down
2 changes: 0 additions & 2 deletions apps/namadillo/src/App/Ibc/IbcShieldAll.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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}
Expand Down
Loading