Skip to content

Commit

Permalink
Implement ledger integration improvements
Browse files Browse the repository at this point in the history
Consolidate approval views for all tx types

Hook up Ledger transfer

Remove unused address from messages

Consolidate tx build calls

Clean up Message and component props
  • Loading branch information
jurevans committed Jul 25, 2023
1 parent a8881ca commit 7438494
Show file tree
Hide file tree
Showing 23 changed files with 463 additions and 668 deletions.
58 changes: 19 additions & 39 deletions apps/extension/src/Approvals/Approvals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ThemeProvider } from "styled-components";
import { Routes, Route } from "react-router-dom";

import { getTheme } from "@namada/utils";
import { TxType } from "@namada/shared";

import {
AppContainer,
Expand All @@ -11,23 +12,29 @@ import {
TopSection,
Heading,
} from "./Approvals.components";
import { ApproveTransfer, ConfirmTransfer } from "./ApproveTransfer";
import { ApproveConnection } from "./ApproveConnection";
import { TopLevelRoute } from "Approvals/types";
import { ConfirmLedgerTransfer } from "./ApproveTransfer/ConfirmLedgerTransfer";
import { ApproveBond, ConfirmBond, ConfirmLedgerBond } from "./ApproveBond";
import { ConfirmLedgerTx } from "./ApproveTx/ConfirmLedgerTx";
import { ConfirmTx } from "./ApproveTx/ConfirmTx";
import { ApproveTx } from "./ApproveTx/ApproveTx";

export enum Status {
Completed,
Pending,
Failed,
}

export type ApprovalDetails = {
source: string;
msgId: string;
txType: TxType;
publicKey?: string;
target?: string;
};

export const Approvals: React.FC = () => {
const theme = getTheme("dark");
const [msgId, setMsgId] = useState("");
const [address, setAddress] = useState("");
const [publicKey, setPublicKey] = useState("");
const [details, setDetails] = useState<ApprovalDetails>();

return (
<ThemeProvider theme={theme}>
Expand All @@ -39,44 +46,17 @@ export const Approvals: React.FC = () => {
</TopSection>
<Routes>
<Route
path={TopLevelRoute.ApproveTransfer}
element={
<ApproveTransfer setMsgId={setMsgId} setAddress={setAddress} />
}
path={`${TopLevelRoute.ApproveTx}/:type`}
element={<ApproveTx setDetails={setDetails} />}
/>
<Route
path={TopLevelRoute.ConfirmTransfer}
element={<ConfirmTransfer msgId={msgId} address={address} />}
path={TopLevelRoute.ConfirmTx}
element={<ConfirmTx details={details} />}
/>
<Route
path={TopLevelRoute.ConfirmLedgerTransfer}
element={<ConfirmLedgerTransfer msgId={msgId} />}
path={TopLevelRoute.ConfirmLedgerTx}
element={<ConfirmLedgerTx details={details} />}
/>
<Route
path={TopLevelRoute.ApproveBond}
element={
<ApproveBond
setAddress={setAddress}
setMsgId={setMsgId}
setPublicKey={setPublicKey}
/>
}
/>
<Route
path={TopLevelRoute.ConfirmBond}
element={<ConfirmBond msgId={msgId} address={address} />}
/>
<Route
path={TopLevelRoute.ConfirmLedgerBond}
element={
<ConfirmLedgerBond
address={address}
msgId={msgId}
publicKey={publicKey}
/>
}
/>

<Route
path={TopLevelRoute.ApproveConnection}
element={<ApproveConnection />}
Expand Down
109 changes: 0 additions & 109 deletions apps/extension/src/Approvals/ApproveBond/ConfirmBond.tsx

This file was deleted.

3 changes: 0 additions & 3 deletions apps/extension/src/Approvals/ApproveBond/index.ts

This file was deleted.

89 changes: 0 additions & 89 deletions apps/extension/src/Approvals/ApproveTransfer/ApproveTransfer.tsx

This file was deleted.

Loading

0 comments on commit 7438494

Please sign in to comment.