Skip to content

Commit

Permalink
feat/311 - Implement ledger integration improvements (#339)
Browse files Browse the repository at this point in the history
* Implement ledger integration improvements

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

* remove reveal pk schema, re-use TxMsgValue instead

* Further clean up, consolidate all getBytes msg

* Lint

* Consolidate submit-signed-tx related methods

* Hook up unbond to Approvals and Ledger

* Lint

* Clean up ConfirmTx

* Consolidate messages into SubmitSignedTx

* Hooking up Withdraw

* clean up

* Clean up imports

* Update ledger-namada package, fix type (indicies -> indices)

* Add ability to get all params from useQuery hook

* clean up slice

* PR feedback, fix amounts issue on unbond

* Additional PR feedback

* Fix, remove additional unnecessary type casts
  • Loading branch information
jurevans authored Jul 27, 2023
1 parent 3c4f4a3 commit 1ab22a2
Show file tree
Hide file tree
Showing 45 changed files with 899 additions and 1,262 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
94 changes: 0 additions & 94 deletions apps/extension/src/Approvals/ApproveBond/ApproveBond.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.

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

This file was deleted.

Loading

0 comments on commit 1ab22a2

Please sign in to comment.