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

feat: transaction store and toasts #2382

Merged
merged 13 commits into from
Dec 21, 2022
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
5 changes: 1 addition & 4 deletions apps/trading-e2e/src/integration/withdraw.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,7 @@ describe('withdraw actions', { tags: '@regression' }, () => {
cy.getByTestId('DELAY_TIME_value').should('have.text', 'None');
cy.get(amountField).clear().type('10');
cy.getByTestId(submitWithdrawBtn).click();
cy.getByTestId('dialog-title').should(
'have.text',
'Awaiting network confirmation'
);
cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
});

it.skip('creates a withdrawal on submit'); // Needs capsule
Expand Down
1 change: 1 addition & 0 deletions apps/trading/components/vega-transaction/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { VegaTransaction } from './vega-transaction';
57 changes: 57 additions & 0 deletions apps/trading/components/vega-transaction/vega-transaction.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { WithdrawalFeedback } from '@vegaprotocol/withdraws';
import { OrderFeedback } from '@vegaprotocol/orders';

import {
VegaDialog,
VegaTxStatus,
isWithdrawTransaction,
isOrderCancellationTransaction,
isOrderSubmissionTransaction,
isOrderAmendmentTransaction,
} from '@vegaprotocol/wallet';
import type { VegaStoredTxState } from '@vegaprotocol/wallet';
import { useEthWithdrawApprovalsStore } from '@vegaprotocol/web3';

export const VegaTransaction = ({
transaction,
}: {
transaction: VegaStoredTxState;
}) => {
const createEthWithdrawalApproval = useEthWithdrawApprovalsStore(
(state) => state.create
);
if (isWithdrawTransaction(transaction.body)) {
if (
transaction.status === VegaTxStatus.Complete &&
transaction.withdrawal
) {
return (
<WithdrawalFeedback
transaction={transaction}
withdrawal={transaction.withdrawal}
availableTimestamp={null}
submitWithdraw={() => {
if (!transaction?.withdrawal) {
return;
}
createEthWithdrawalApproval(
transaction.withdrawal,
transaction.withdrawalApproval
);
}}
/>
);
}
} else if (
(isOrderCancellationTransaction(transaction.body) ||
isOrderSubmissionTransaction(transaction.body) ||
isOrderAmendmentTransaction(transaction.body)) &&
transaction.status === VegaTxStatus.Complete &&
transaction.order
) {
return (
<OrderFeedback transaction={transaction} order={transaction.order} />
);
}
return <VegaDialog transaction={transaction} />;
};
21 changes: 20 additions & 1 deletion apps/trading/pages/_app.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ import { t, ThemeContext, useThemeSwitcher } from '@vegaprotocol/react-helpers';
import {
useEagerConnect as useVegaEagerConnect,
VegaWalletProvider,
useVegaTransactionManager,
useVegaTransactionUpdater,
} from '@vegaprotocol/wallet';
import {
useEagerConnect as useEthereumEagerConnect,
useEthTransactionManager,
useEthTransactionUpdater,
useEthWithdrawApprovalsManager,
} from '@vegaprotocol/web3';
import {
EnvironmentProvider,
envTriggerMapping,
Expand All @@ -18,9 +26,9 @@ import { usePageTitleStore } from '../stores';
import { Footer } from '../components/footer';
import { useEffect, useMemo, useState } from 'react';
import DialogsContainer from './dialogs-container';
import ToastsManager from './toasts-manager';
import { HashRouter, useLocation } from 'react-router-dom';
import { Connectors } from '../lib/vega-connectors';
import { useEagerConnect as useEthereumEagerConnect } from '@vegaprotocol/web3';

const DEFAULT_TITLE = t('Welcome to Vega trading!');

Expand All @@ -45,6 +53,15 @@ const Title = () => {
);
};

const TransactionsHandler = () => {
useVegaTransactionManager();
useVegaTransactionUpdater();
useEthTransactionManager();
useEthTransactionUpdater();
useEthWithdrawApprovalsManager();
return null;
};

function AppBody({ Component }: AppProps) {
const location = useLocation();
const { VEGA_ENV } = useEnvironment();
Expand All @@ -71,6 +88,8 @@ function AppBody({ Component }: AppProps) {
</main>
<Footer />
<DialogsContainer />
<ToastsManager />
<TransactionsHandler />
<MaybeConnectEagerly />
</div>
</Web3Provider>
Expand Down
5 changes: 3 additions & 2 deletions apps/trading/pages/dialogs-container.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import {
} from '@vegaprotocol/assets';
import { VegaConnectDialog } from '@vegaprotocol/wallet';
import { Connectors } from '../lib/vega-connectors';
import { WithdrawalDialog } from '@vegaprotocol/withdraws';
import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
import { DepositDialog } from '@vegaprotocol/deposits';
import { Web3ConnectUncontrolledDialog } from '@vegaprotocol/web3';
import { WelcomeDialog } from '../components/welcome-dialog';

const DialogsContainer = () => {
const { isOpen, id, trigger, setOpen } = useAssetDetailsDialogStore();

return (
<>
<VegaConnectDialog connectors={Connectors} />
Expand All @@ -23,7 +24,7 @@ const DialogsContainer = () => {
<WelcomeDialog />
<DepositDialog />
<Web3ConnectUncontrolledDialog />
<WithdrawalDialog />
<CreateWithdrawalDialog />
</>
);
};
Expand Down
Loading