Skip to content

Commit 2b7293d

Browse files
authored
fix: namadillo v2 fixes (#1994)
1 parent f021951 commit 2b7293d

File tree

10 files changed

+18
-12
lines changed

10 files changed

+18
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const EstimateShieldingRewardsCard = (): JSX.Element => {
99
return (
1010
<div
1111
className={clsx(
12-
"flex items-center gap-12 text-sm text-yellow bg-neutral-900 rounded-sm px-6",
12+
"flex items-center gap-12 text-sm text-yellow bg-neutral-900 rounded-sm px-6 mr-3",
1313
"py-4"
1414
)}
1515
>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const ShieldedAssetsOverview = (): JSX.Element => {
1515

1616
return (
1717
<Panel className="relative z-10 px-6 border border-yellow rounded-t-none -mt-px h-full">
18-
<div className="flex items-center gap-16 mt-4">
18+
<div className="flex justify-between gap-16 mt-4">
1919
<TotalBalanceCard
2020
balanceInFiat={shieldedAmountInFiat}
2121
isShielded={true}

apps/namadillo/src/App/Governance/GovernanceOverview.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export const GovernanceOverview: React.FC = () => {
6767
<UpcomingProposals proposals={upcomingProposals} />
6868
</ProposalListPanel>
6969
<ProposalListPanel
70+
className="flex-1"
7071
title="All Proposals"
7172
errorText="Unable to load the list of proposals"
7273
atoms={activeAtoms}
@@ -77,7 +78,7 @@ export const GovernanceOverview: React.FC = () => {
7778
)}
7879
/>
7980
</ProposalListPanel>
80-
<NavigationFooter />
81+
<NavigationFooter className="flex-none h-16" />
8182
</div>
8283
<Sidebar>
8384
<Panel>

apps/namadillo/src/App/Governance/ProposalListPanel.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ type ProposalListPanelProps = {
1111
errorText: string;
1212
emptyText?: string;
1313
isEmpty?: boolean;
14+
className?: string;
1415
};
1516

1617
export const ProposalListPanel = ({
@@ -20,10 +21,11 @@ export const ProposalListPanel = ({
2021
errorText,
2122
emptyText,
2223
isEmpty,
24+
className,
2325
}: ProposalListPanelProps): JSX.Element => {
2426
const loaded = atomsAreLoaded(...atoms);
2527
return (
26-
<Panel title={title}>
28+
<Panel title={title} className={className}>
2729
<AtomErrorBoundary
2830
result={atoms}
2931
niceError={errorText}

apps/namadillo/src/App/Masp/MaspShield.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const MaspShield: React.FC = () => {
132132
return (
133133
<Panel className="rounded-sm flex flex-col flex-1">
134134
<header className="flex flex-col items-center text-center mb-3 gap-6">
135-
<h1 className="mt-20 text-lg text-yellow">Shielding Transfer</h1>
135+
<h1 className="mt-6 text-lg text-yellow">Shielding Transfer</h1>
136136
<NamadaTransferTopHeader
137137
isSourceShielded={false}
138138
isDestinationShielded={true}

apps/namadillo/src/App/Masp/MaspUnshield.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export const MaspUnshield: React.FC = () => {
129129
setLedgerStatusStop(isPerformingTransfer);
130130

131131
return (
132-
<Panel className="relative rounded-sm flex flex-col flex-1 pt-30">
132+
<Panel className="relative rounded-sm flex flex-col flex-1 pt-14">
133133
<header className="flex flex-col items-center text-center mb-3 gap-6">
134134
<h1 className="text-lg">Unshielding Transfer</h1>
135135
<NamadaTransferTopHeader

apps/namadillo/src/App/NamadaTransfer/NamadaTransfer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export const NamadaTransfer: React.FC = () => {
161161
setLedgerStatusStop(isPerformingTransfer);
162162

163163
return (
164-
<Panel className="min-h-[600px] rounded-sm flex flex-col flex-1 py-20">
164+
<Panel className="min-h-[600px] rounded-sm flex flex-col flex-1 pt-5 pb-20">
165165
<header className="flex flex-col items-center text-center mb-3 gap-6">
166166
<h1
167167
className={twMerge("mt-6 text-xl", isSourceShielded && "text-yellow")}

apps/namadillo/src/App/Staking/MyValidatorsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const MyValidatorsTable = (): JSX.Element => {
107107

108108
return (
109109
<>
110-
<nav className="flex justify-end -mt-15 gap-2">
110+
<nav className="flex justify-end -mt-15 gap-2 pb-3">
111111
<ActionButton
112112
className="basis-[content] py-1"
113113
backgroundColor="cyan"

apps/namadillo/src/App/Staking/StakingOverview.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const StakingOverview = (): JSX.Element => {
2626

2727
return (
2828
<PageWithSidebar>
29-
<div className="flex flex-col gap-2">
29+
<div className="flex flex-col flex-1 gap-2">
3030
{!userHasAccount && <ConnectBanner actionText="To stake" />}
3131
{userHasAccount && <StakingSummary />}
3232
{hasStaking && (
@@ -47,10 +47,13 @@ export const StakingOverview = (): JSX.Element => {
4747
<UnbondingAmountsTable />
4848
</Panel>
4949
)}
50-
<Panel className="relative pb-6 overflow-hidden" title="All Validators">
50+
<Panel
51+
className="relative pb-6 overflow-hidden flex-1"
52+
title="All Validators"
53+
>
5154
<AllValidatorsTable />
5255
</Panel>
53-
<NavigationFooter />
56+
<NavigationFooter className="flex-none h-16" />
5457
</div>
5558
<Sidebar>
5659
{hasStaking && myValidators.isSuccess && (

packages/components/src/TabContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const TabContainer = ({
5252
"--hover":
5353
activeTabIndex !== index ? colors.neutral[900] : colors.black,
5454
"--text-color": colors.white,
55-
"--text-hover-color": colors.white,
55+
"--text-hover-color": colors.yellow[400],
5656
} as React.CSSProperties
5757
}
5858
{...buttonProps}

0 commit comments

Comments
 (0)