Skip to content

Commit 5906e69

Browse files
authored
feat(namadillo): general content tweaks (#1117)
1 parent 2f9da91 commit 5906e69

File tree

8 files changed

+27
-33
lines changed

8 files changed

+27
-33
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const ConnectExtensionButton = (): JSX.Element => {
1313
<>
1414
{extensionAttachStatus === "attached" && !isExtensionConnected && (
1515
<ActionButton backgroundColor="yellow" size="sm" onClick={connect}>
16-
Connect Extension
16+
Connect Keychain
1717
</ActionButton>
1818
)}
1919
{extensionAttachStatus === "detached" && (
@@ -24,7 +24,7 @@ export const ConnectExtensionButton = (): JSX.Element => {
2424
backgroundColor="yellow"
2525
size="sm"
2626
>
27-
Download Extension
27+
Download Keychain
2828
</ActionButton>
2929
)}
3030
</>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Intro = (): JSX.Element => {
1313
"uppercase text-center font-medium text-yellow leading-10 text-4xl"
1414
)}
1515
>
16-
Your Gateway to Shielded Multichain
16+
Your Gateway to the Shielded Multichain
1717
</h2>
1818
</div>
1919
<div className="flex gap-4 w-full">
@@ -25,7 +25,7 @@ export const Intro = (): JSX.Element => {
2525
size="sm"
2626
outlineColor="yellow"
2727
>
28-
Help
28+
Community Help
2929
</ActionButton>
3030
</div>
3131
</div>

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { SidebarMenuItem } from "App/Common/SidebarMenuItem";
22
import GovernanceRoutes from "App/Governance/routes";
33
import { MASPIcon } from "App/Icons/MASPIcon";
4-
import { SwapIcon } from "App/Icons/SwapIcon";
54
import { AiFillHome } from "react-icons/ai";
65
import { BsDiscord, BsTwitterX } from "react-icons/bs";
76
import { FaVoteYea } from "react-icons/fa";
@@ -36,7 +35,7 @@ export const Navigation = (): JSX.Element => {
3635
<li>
3736
<SidebarMenuItem>
3837
<IoSwapHorizontal />
39-
Transfer
38+
IBC Transfer
4039
</SidebarMenuItem>
4140
</li>
4241
<li>
@@ -47,14 +46,6 @@ export const Navigation = (): JSX.Element => {
4746
MASP
4847
</SidebarMenuItem>
4948
</li>
50-
<li>
51-
<SidebarMenuItem>
52-
<i className="w-4">
53-
<SwapIcon />
54-
</i>
55-
Swap
56-
</SidebarMenuItem>
57-
</li>
5849
</ul>
5950
<footer className="flex flex-col gap-10">
6051
<ul className="flex flex-col gap-1 text-neutral-300 text-sm">
@@ -65,7 +56,7 @@ export const Navigation = (): JSX.Element => {
6556
target="_blank"
6657
rel="noreferrer"
6758
>
68-
Help
59+
Community Help
6960
</a>
7061
</li>
7162
</ul>

apps/namadillo/src/App/Settings/Advanced.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { ActionButton, Input, Stack } from "@namada/components";
2+
import { chainParametersAtom } from "atoms/chain";
23
import {
34
indexerUrlAtom,
45
rpcUrlAtom,
56
updateIndexerUrlAtom,
67
updateRpcUrlAtom,
78
} from "atoms/settings";
8-
import { useAtom } from "jotai";
9+
import { useAtom, useAtomValue } from "jotai";
910
import { useState } from "react";
1011
import { useLocation } from "react-router-dom";
1112

@@ -16,6 +17,7 @@ export const Advanced = (): JSX.Element => {
1617
const [rpcMutation] = useAtom(updateRpcUrlAtom);
1718
const [currentIndexer] = useAtom(indexerUrlAtom);
1819
const [indexerMutation] = useAtom(updateIndexerUrlAtom);
20+
const { data: chainParameters } = useAtomValue(chainParametersAtom);
1921

2022
const [rpc, setRpc] = useState(currentRpc);
2123
const [indexer, setIndexer] = useState(currentIndexer);
@@ -69,6 +71,14 @@ export const Advanced = (): JSX.Element => {
6971
}}
7072
required
7173
/>
74+
<Input
75+
type="text"
76+
variant="ReadOnlyCopy"
77+
value={chainParameters?.chainId}
78+
label="Chain ID (provided by the Indexer)"
79+
disabled={true}
80+
className="[&_input]:border-neutral-800"
81+
/>
7282
</Stack>
7383
<ActionButton
7484
className="shrink-0"

apps/namadillo/src/App/Settings/SettingsMain.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
import { chainParametersAtom } from "atoms/chain/atoms";
2-
import { useAtomValue } from "jotai";
31
import { version } from "../../../package.json";
42
import { SettingsPanelMenuItem } from "./SettingsPanelMenuItem";
53
import SettingsRoutes from "./routes";
64

75
export const SettingsMain = (): JSX.Element => {
8-
const { data: chainParameters } = useAtomValue(chainParametersAtom);
9-
106
return (
117
<div className="flex flex-1 justify-between flex-col">
128
<ul className="flex flex-col gap-2">
@@ -20,8 +16,7 @@ export const SettingsMain = (): JSX.Element => {
2016
/>
2117
</ul>
2218
<div className="text-xs">
23-
<div>Version: {version}</div>
24-
<div>Chain ID: {chainParameters?.chainId}</div>
19+
<div>Namadillo Version: {version}</div>
2520
</div>
2621
</div>
2722
);

apps/namadillo/src/App/Sidebars/MainnetRoadmap.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,22 @@ const MainnetRoadmap = (): JSX.Element => {
5151
)}
5252
{renderPhase(
5353
"2",
54-
<>
55-
Proof of Stake Rewards
56-
<br />
57-
PGF Inflation
58-
</>,
54+
<>Staking Rewards</>,
5955
claimRewardsEnabled ? "opacity-100" : "opacity-25",
6056
claimRewardsEnabled
6157
)}
58+
{renderPhase("2", <></>, "opacity-25")}
6259
{renderPhase(
6360
"3",
6461
<>
65-
MASP Enabled
66-
<br />
6762
IBC Transfers
63+
<br />
64+
MASP Enabled
6865
</>,
6966
"opacity-25"
7067
)}
71-
{renderPhase("4", "Shielded Rewards", "opacity-25")}
72-
{renderPhase("5", "NAM Transfers", "opacity-25")}
68+
{renderPhase("4", "Shielding Rewards", "opacity-25")}
69+
{renderPhase("5", "NAM Transfers enabled", "opacity-25")}
7370
</ul>
7471
<ActionButton
7572
className="max-w-40 mt-6"

apps/namadillo/src/App/Sidebars/ValidatorDiversification.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ export const ValidatorDiversification = (): JSX.Element => {
1818
outlineColor="cyan"
1919
textHoverColor="black"
2020
backgroundHoverColor="cyan"
21-
href="https://namada.net"
21+
href="https://namada.net/blog/namada-cubic-proof-of-stake"
2222
target="_blank"
23+
rel="nofollow noreferrer"
2324
size="xs"
2425
>
2526
Learn about CPoS

apps/namadillo/src/App/Sidebars/YourStakingDistribution.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const YourStakingDistribution = ({
7070
animate={{ opacity: 1 }}
7171
exit={{ opacity: 0 }}
7272
>
73-
Your Staking Distribution
73+
Your Stake Distribution
7474
</motion.span>
7575
)}
7676
{displayedValidator && (

0 commit comments

Comments
 (0)