Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namadillo: general content tweaks #1117

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/namadillo/src/App/Common/ConnectExtensionButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const ConnectExtensionButton = (): JSX.Element => {
<>
{extensionAttachStatus === "attached" && !isExtensionConnected && (
<ActionButton backgroundColor="yellow" size="sm" onClick={connect}>
Connect Extension
Connect Keychain
</ActionButton>
)}
{extensionAttachStatus === "detached" && (
Expand All @@ -24,7 +24,7 @@ export const ConnectExtensionButton = (): JSX.Element => {
backgroundColor="yellow"
size="sm"
>
Download Extension
Download Keychain
</ActionButton>
)}
</>
Expand Down
4 changes: 2 additions & 2 deletions apps/namadillo/src/App/Common/Intro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const Intro = (): JSX.Element => {
"uppercase text-center font-medium text-yellow leading-10 text-4xl"
)}
>
Your Gateway to Shielded Multichain
Your Gateway to the Shielded Multichain
</h2>
</div>
<div className="flex gap-4 w-full">
Expand All @@ -25,7 +25,7 @@ export const Intro = (): JSX.Element => {
size="sm"
outlineColor="yellow"
>
Help
Community Help
</ActionButton>
</div>
</div>
Expand Down
13 changes: 2 additions & 11 deletions apps/namadillo/src/App/Common/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { SidebarMenuItem } from "App/Common/SidebarMenuItem";
import GovernanceRoutes from "App/Governance/routes";
import { MASPIcon } from "App/Icons/MASPIcon";
import { SwapIcon } from "App/Icons/SwapIcon";
import { AiFillHome } from "react-icons/ai";
import { BsDiscord, BsTwitterX } from "react-icons/bs";
import { FaVoteYea } from "react-icons/fa";
Expand Down Expand Up @@ -36,7 +35,7 @@ export const Navigation = (): JSX.Element => {
<li>
<SidebarMenuItem>
<IoSwapHorizontal />
Transfer
IBC Transfer
</SidebarMenuItem>
</li>
<li>
Expand All @@ -47,14 +46,6 @@ export const Navigation = (): JSX.Element => {
MASP
</SidebarMenuItem>
</li>
<li>
<SidebarMenuItem>
<i className="w-4">
<SwapIcon />
</i>
Swap
</SidebarMenuItem>
</li>
</ul>
<footer className="flex flex-col gap-10">
<ul className="flex flex-col gap-1 text-neutral-300 text-sm">
Expand All @@ -65,7 +56,7 @@ export const Navigation = (): JSX.Element => {
target="_blank"
rel="noreferrer"
>
Help
Community Help
</a>
</li>
</ul>
Expand Down
12 changes: 11 additions & 1 deletion apps/namadillo/src/App/Settings/Advanced.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { ActionButton, Input, Stack } from "@namada/components";
import { chainParametersAtom } from "atoms/chain";
import {
indexerUrlAtom,
rpcUrlAtom,
updateIndexerUrlAtom,
updateRpcUrlAtom,
} from "atoms/settings";
import { useAtom } from "jotai";
import { useAtom, useAtomValue } from "jotai";
import { useState } from "react";
import { useLocation } from "react-router-dom";

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

const [rpc, setRpc] = useState(currentRpc);
const [indexer, setIndexer] = useState(currentIndexer);
Expand Down Expand Up @@ -69,6 +71,14 @@ export const Advanced = (): JSX.Element => {
}}
required
/>
<Input
type="text"
variant="ReadOnlyCopy"
value={chainParameters?.chainId}
label="Chain ID (provided by the Indexer)"
disabled={true}
className="[&_input]:border-neutral-800"
/>
</Stack>
<ActionButton
className="shrink-0"
Expand Down
7 changes: 1 addition & 6 deletions apps/namadillo/src/App/Settings/SettingsMain.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import { chainParametersAtom } from "atoms/chain/atoms";
import { useAtomValue } from "jotai";
import { version } from "../../../package.json";
import { SettingsPanelMenuItem } from "./SettingsPanelMenuItem";
import SettingsRoutes from "./routes";

export const SettingsMain = (): JSX.Element => {
const { data: chainParameters } = useAtomValue(chainParametersAtom);

return (
<div className="flex flex-1 justify-between flex-col">
<ul className="flex flex-col gap-2">
Expand All @@ -20,8 +16,7 @@ export const SettingsMain = (): JSX.Element => {
/>
</ul>
<div className="text-xs">
<div>Version: {version}</div>
<div>Chain ID: {chainParameters?.chainId}</div>
<div>Namadillo Version: {version}</div>
</div>
</div>
);
Expand Down
15 changes: 6 additions & 9 deletions apps/namadillo/src/App/Sidebars/MainnetRoadmap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,22 @@ const MainnetRoadmap = (): JSX.Element => {
)}
{renderPhase(
"2",
<>
Proof of Stake Rewards
<br />
PGF Inflation
</>,
<>Staking Rewards</>,
claimRewardsEnabled ? "opacity-100" : "opacity-25",
claimRewardsEnabled
)}
{renderPhase("2", <></>, "opacity-25")}
{renderPhase(
"3",
<>
MASP Enabled
<br />
IBC Transfers
<br />
MASP Enabled
</>,
"opacity-25"
)}
{renderPhase("4", "Shielded Rewards", "opacity-25")}
{renderPhase("5", "NAM Transfers", "opacity-25")}
{renderPhase("4", "Shielding Rewards", "opacity-25")}
{renderPhase("5", "NAM Transfers enabled", "opacity-25")}
</ul>
<ActionButton
className="max-w-40 mt-6"
Expand Down
3 changes: 2 additions & 1 deletion apps/namadillo/src/App/Sidebars/ValidatorDiversification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ export const ValidatorDiversification = (): JSX.Element => {
outlineColor="cyan"
textHoverColor="black"
backgroundHoverColor="cyan"
href="https://namada.net"
href="https://namada.net/blog/namada-cubic-proof-of-stake"
target="_blank"
rel="nofollow noreferrer"
size="xs"
>
Learn about CPoS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const YourStakingDistribution = ({
animate={{ opacity: 1 }}
exit={{ opacity: 0 }}
>
Your Staking Distribution
Your Stake Distribution
</motion.span>
)}
{displayedValidator && (
Expand Down
Loading