diff --git a/apps/namadillo/package.json b/apps/namadillo/package.json index f178fb86d0..3fb25f92bf 100644 --- a/apps/namadillo/package.json +++ b/apps/namadillo/package.json @@ -1,6 +1,6 @@ { "name": "@namada/namadillo", - "version": "1.1.4", + "version": "1.1.5", "description": "Namadillo", "repository": "https://github.com/anoma/namada-interface/", "author": "Heliax Dev ", diff --git a/apps/namadillo/src/App/AccountOverview/TransparentOverviewPanel.tsx b/apps/namadillo/src/App/AccountOverview/TransparentOverviewPanel.tsx index b995c5cafa..4cf148fa50 100644 --- a/apps/namadillo/src/App/AccountOverview/TransparentOverviewPanel.tsx +++ b/apps/namadillo/src/App/AccountOverview/TransparentOverviewPanel.tsx @@ -11,9 +11,13 @@ import { TokenCurrency } from "App/Common/TokenCurrency"; import { params, routes } from "App/routes"; import { TokenBalance, transparentTokensAtom } from "atoms/balance/atoms"; import { getTotalDollar } from "atoms/balance/functions"; +import { applicationFeaturesAtom } from "atoms/settings"; import { getAssetImageUrl } from "integrations/utils"; import { useAtomValue } from "jotai"; import { useEffect, 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 { isNamadaAsset } from "utils"; @@ -26,6 +30,7 @@ const TransparentTokensTable = ({ data: TokenBalance[]; }): JSX.Element => { const [page, setPage] = useState(initialPage); + const { namTransfersEnabled } = useAtomValue(applicationFeaturesAtom); const headers = ["Token", { children: "Balance", className: "text-right" }]; @@ -36,6 +41,7 @@ const TransparentTokensTable = ({ dollar, }: TokenBalance): TableRow => { const icon = getAssetImageUrl(asset); + const isNam = isNamadaAsset(asset); return { cells: [ @@ -72,7 +78,7 @@ const TransparentTokensTable = ({ > Shield - {isNamadaAsset(asset) && ( + {isNam && ( )} +
+ {isNam && !namTransfersEnabled ? + NAM Transfer Locked + : [ + { + url: `${routes.transfer}?${params.asset}=${originalAddress}`, + icon: , + }, + { + url: `${routes.ibc}?${params.asset}=${originalAddress}`, + icon: ( + + ), + }, + ].map(({ url, icon }) => ( + + {icon} + + )) + } +
, ], }; diff --git a/apps/namadillo/src/App/Ibc/assets/IbcLogo.tsx b/apps/namadillo/src/App/Ibc/assets/IbcLogo.tsx new file mode 100644 index 0000000000..c1803956d1 --- /dev/null +++ b/apps/namadillo/src/App/Ibc/assets/IbcLogo.tsx @@ -0,0 +1,16 @@ +export const IbcLogo = (): JSX.Element => { + return ( + + + + + + + ); +}; diff --git a/apps/namadillo/src/App/Layout/TopNavigation.tsx b/apps/namadillo/src/App/Layout/TopNavigation.tsx index af30c66a5a..3efde8df88 100644 --- a/apps/namadillo/src/App/Layout/TopNavigation.tsx +++ b/apps/namadillo/src/App/Layout/TopNavigation.tsx @@ -1,5 +1,6 @@ import { ActionButton } from "@namada/components"; import { ConnectExtensionButton } from "App/Common/ConnectExtensionButton"; +import { IbcLogo } from "App/Ibc/assets/IbcLogo"; import { routes } from "App/routes"; import { applicationFeaturesAtom, @@ -35,12 +36,10 @@ export const TopNavigation = (): JSX.Element => {
{maspEnabled && ( - - Shield assets + +
+ Shield Assets over +
)} {(maspEnabled || namTransfersEnabled) && ( @@ -48,7 +47,7 @@ export const TopNavigation = (): JSX.Element => { href={routes.transfer} size="sm" backgroundColor="white" - className="w-[140px]" + className="min-w-[140px]" > Transfer