Skip to content

Commit

Permalink
anoma#66 Unifying data types and fake data in staking (anoma#67)
Browse files Browse the repository at this point in the history
* changed all fake data to go through actions
* cleaned up staking related types
* Added links to the UI descriptions to the local readme of the state
* removed empty reducers

Follow up for the tests once the logic and data models are final:
anoma/namada-interface#104
  • Loading branch information
memasdeligeorgakis authored Oct 4, 2022
1 parent d7d702a commit 6bb47eb
Show file tree
Hide file tree
Showing 13 changed files with 201 additions and 165 deletions.
22 changes: 19 additions & 3 deletions apps/namada-interface/src/App/Staking/Staking.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import { StakingContainer } from "./Staking.components";
import { StakingOverview } from "./StakingOverview";
import { ValidatorDetails } from "./ValidatorDetails";
import { TopLevelRoute, StakingAndGovernanceSubRoute } from "App/types";
import { Validator } from "slices/StakingAndGovernance";
import {
MyBalanceEntry,
Validator,
MyValidators,
} from "slices/StakingAndGovernance";

const initialTitle = "Staking";

Expand Down Expand Up @@ -38,8 +42,11 @@ const validatorNameFromUrl = (path: string): string | undefined => {
};

type Props = {
myBalances: MyBalanceEntry[];
validators: Validator[];
myValidators: MyValidators[];
selectedValidator: string | undefined;
fetchMyBalances: () => void;
fetchValidators: () => void;
fetchValidatorDetails: (validatorId: string) => void;
};
Expand All @@ -50,7 +57,14 @@ export const Staking = (props: Props): JSX.Element => {
const location = useLocation();
const navigate = useNavigate();

const { fetchValidators, fetchValidatorDetails, validators } = props;
const {
fetchMyBalances,
fetchValidators,
fetchValidatorDetails,
myBalances,
validators,
myValidators,
} = props;

// this is just so we can se the title/breadcrumb
// in real case we do this cleanly in a callback that
Expand All @@ -70,6 +84,7 @@ export const Staking = (props: Props): JSX.Element => {
});

useEffect(() => {
fetchMyBalances();
fetchValidators();
}, []);

Expand Down Expand Up @@ -110,7 +125,8 @@ export const Staking = (props: Props): JSX.Element => {
element={
<StakingOverview
navigateToValidatorDetails={navigateToValidatorDetails}
ownValidators={[]}
myBalances={myBalances}
myValidators={myValidators}
validators={validators}
/>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,25 @@ import {
TableDimmedCell,
TableConfigurations,
} from "components/Table";

import { myBalancesData, myValidatorData } from "./fakeData";
import {
MyBalanceRow,
MyBalanceEntry,
Validator,
MyStaking,
MyValidators,
} from "slices/StakingAndGovernance";

// My Balances table row renderer and configuration
const myBalancesRowRenderer = (myBalanceRow: MyBalanceRow): JSX.Element => {
const myBalancesRowRenderer = (myBalanceEntry: MyBalanceEntry): JSX.Element => {
return (
<>
<td>{myBalanceRow.key}</td>
<td>{myBalanceRow.baseCurrency}</td>
<td>{myBalanceEntry.key}</td>
<td>{myBalanceEntry.baseCurrency}</td>
<td>
<TableDimmedCell>{myBalanceRow.fiatCurrency}</TableDimmedCell>
<TableDimmedCell>{myBalanceEntry.fiatCurrency}</TableDimmedCell>
</td>
</>
);
};
const myBalancesConfigurations: TableConfigurations<MyBalanceRow, never> = {
const myBalancesConfigurations: TableConfigurations<MyBalanceEntry, never> = {
title: "My Balances",
rowRenderer: myBalancesRowRenderer,
columns: [
Expand All @@ -36,15 +34,15 @@ const myBalancesConfigurations: TableConfigurations<MyBalanceRow, never> = {
};

const MyValidatorsRowRenderer = (
myValidatorRow: MyStaking,
myValidatorRow: MyValidators,
callbacks?: ValidatorsCallbacks
): JSX.Element => {
return (
<>
<td>
<TableLink
onClick={() => {
const formattedValidatorName = myValidatorRow.name
const formattedValidatorName = myValidatorRow.validator.name
.replace(" ", "-")
.toLowerCase();

Expand All @@ -56,7 +54,7 @@ const MyValidatorsRowRenderer = (
callbacks && callbacks.onClickValidator(formattedValidatorName);
}}
>
{myValidatorRow.name}
{myValidatorRow.validator.name}
</TableLink>
</td>
<td>{myValidatorRow.stakingStatus}</td>
Expand All @@ -67,7 +65,7 @@ const MyValidatorsRowRenderer = (

const getMyValidatorsConfiguration = (
navigateToValidatorDetails: (validatorId: string) => void
): TableConfigurations<MyStaking, ValidatorsCallbacks> => {
): TableConfigurations<MyValidators, ValidatorsCallbacks> => {
return {
title: "My Validators",
rowRenderer: MyValidatorsRowRenderer,
Expand Down Expand Up @@ -134,12 +132,14 @@ const getAllValidatorsConfiguration = (

type Props = {
navigateToValidatorDetails: (validatorId: string) => void;
myBalances: MyBalanceEntry[];
validators: Validator[];
ownValidators: Validator[];
myValidators: MyValidators[];
};

export const StakingOverview = (props: Props): JSX.Element => {
const { navigateToValidatorDetails, validators } = props;
const { navigateToValidatorDetails, myBalances, validators, myValidators } =
props;

// we get the configurations for 2 tables that contain callbacks
const myValidatorsConfiguration = getMyValidatorsConfiguration(
Expand All @@ -154,14 +154,15 @@ export const StakingOverview = (props: Props): JSX.Element => {
{/* my balances */}
<Table
title="My Balances"
data={myBalancesData}
data={myBalances}
tableConfigurations={myBalancesConfigurations}
/>

{/* my validators */}
<Table
title="My Validators"
data={myValidatorData}
// data={myValidatorData}
data={myValidators}
tableConfigurations={myValidatorsConfiguration}
/>

Expand Down
70 changes: 0 additions & 70 deletions apps/namada-interface/src/App/Staking/StakingOverview/fakeData.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import { useState } from "react";
import { MainContainerNavigation } from "App/StakingAndGovernance/MainContainerNavigation";
import { ValidatorDetailsContainer } from "./ValidatorDetails.components";
import { Table } from "components/Table";

type Props = {
validator?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
} from "App/types";

import {
fetchMyBalances,
fetchValidators,
fetchValidatorDetails,
} from "slices/StakingAndGovernance";
Expand All @@ -27,7 +28,9 @@ export const StakingAndGovernance = (): JSX.Element => {
const stakingAndGovernance = useAppSelector(
(state: RootState) => state.stakingAndGovernance
);
const { validators, selectedValidatorId } = stakingAndGovernance;
const { myBalances, validators, myValidators, selectedValidatorId } =
stakingAndGovernance;

// we need one of the sub routes, staking alone has nothing
const stakingAndGovernanceSubRoute =
locationToStakingAndGovernanceSubRoute(location);
Expand All @@ -47,6 +50,10 @@ export const StakingAndGovernance = (): JSX.Element => {
dispatch(fetchValidators());
};

const fetchMyBalancesCallback = (): void => {
dispatch(fetchMyBalances());
};

// triggered by the url load or user click in <Staking />
const fetchValidatorDetailsCallback = (validatorId: string): void => {
dispatch(fetchValidatorDetails(validatorId));
Expand All @@ -59,8 +66,11 @@ export const StakingAndGovernance = (): JSX.Element => {
path={`${StakingAndGovernanceSubRoute.Staking}/*`}
element={
<Staking
myBalances={myBalances}
validators={validators}
myValidators={myValidators}
selectedValidator={selectedValidatorId}
fetchMyBalances={fetchMyBalancesCallback}
fetchValidators={fetchValidatorsCallback}
fetchValidatorDetails={fetchValidatorDetailsCallback}
/>
Expand Down
2 changes: 0 additions & 2 deletions apps/namada-interface/src/components/Table/Table.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { useState } from "react";
import { MainContainerNavigation } from "App/StakingAndGovernance/MainContainerNavigation";
import { TableContainer, TableElement } from "./Table.components";
import { TableConfigurations, RowBase, ColumnDefinition } from "./types";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Staking And Governance
This part of hte state deals with the data that is mostly under Staking & Governance in the UI. It allows the user to perform all the actions regarding Staking, Governance and Public Goods Funding.
This part of the state deals with the data that is under Staking & Governance in the UI. It allows the user to perform all the actions regarding Staking, Governance and Public Goods Funding.

These are the UIs the state is mainly serving:
* **Staking** - [https://specs.anoma.net/main/architecture/clients/web-wallet.html#stakingoverview](https://specs.anoma.net/main/architecture/clients/web-wallet.html#stakingoverview).
* **Governance** - [https://specs.anoma.net/main/architecture/clients/web-wallet.html#governanceproposals](https://specs.anoma.net/main/architecture/clients/web-wallet.html#governanceproposals).
* **Public goods funding** - [https://specs.anoma.net/main/architecture/clients/web-wallet.html#publicgoodsfundingoverview](https://specs.anoma.net/main/architecture/clients/web-wallet.html#publicgoodsfundingoverview).

Loading

0 comments on commit 6bb47eb

Please sign in to comment.