From f397b666d81c4caa69a8cc8960ae284302c5a0d9 Mon Sep 17 00:00:00 2001
From: Sergei Novikov <boomer.create@gmail.com>
Date: Thu, 14 Dec 2023 14:28:11 +0300
Subject: [PATCH] solution: reorganize components

---
 .../create-tx/CreateErc20ApproveTx.ts         |   2 +-
 .../create-tx/CreateErc20ConvertTx.ts         |   7 +-
 .../src/app/screen/Screen/Screen.tsx          |   8 +-
 .../common/AmountField/AmountField.spec.tsx   |  41 --
 .../src/common/AmountField/AmountField.tsx    | 136 ----
 .../react-app/src/common/AmountField/index.ts |   1 -
 .../src/common/BtcConfirm/BtcConfirm.tsx      |  82 ---
 .../react-app/src/common/BtcConfirm/RawTx.tsx |  38 -
 .../src/common/BtcConfirm/RawTxDetails.tsx    | 146 ----
 .../react-app/src/common/BtcConfirm/index.ts  |   1 -
 .../BroadcastEthTx/BroadcastEthTx.spec.tsx    |  75 --
 .../BroadcastEthTx/BroadcastEthTx.tsx         | 168 -----
 .../src/transaction/BroadcastEthTx/index.ts   |   1 -
 .../BroadcastTransaction.tsx                  |   0
 .../display/blockchain/bitcoin.tsx            |   0
 .../display/blockchain/ethereum.tsx           |   0
 .../display/blockchain/index.ts               |   0
 .../BroadcastTransaction/display/common.tsx   |   0
 .../display/components/Actions.tsx            |   0
 .../display/components/BitcoinDecoded.tsx     |   0
 .../display/components/EthereumDecoded.tsx    |   0
 .../display/components/RawTx.tsx              |   0
 .../display/components/index.ts               |   0
 .../BroadcastTransaction/display/display.ts   |   0
 .../BroadcastTransaction/display/index.ts     |   0
 .../BroadcastTransaction/display/types.ts     |   0
 .../BroadcastTransaction/index.ts             |   0
 .../CreateRecoverTransaction.tsx              | 662 ------------------
 .../CreateRecoverTransaction/index.ts         |   1 -
 .../CreateTransaction.tsx                     |   0
 .../SetupTransaction/SetupTransaction.tsx     |   2 +-
 .../flow/blockchain/bitcoin/index.ts          |   0
 .../flow/blockchain/bitcoin/modify/cancel.tsx |   0
 .../flow/blockchain/bitcoin/modify/index.ts   |   0
 .../flow/blockchain/bitcoin/modify/modify.tsx |   2 +-
 .../blockchain/bitcoin/modify/speedup.tsx     |   0
 .../flow/blockchain/bitcoin/transfer.tsx      |   0
 .../blockchain/ethereum/erc20/approve.tsx     |   6 +-
 .../blockchain/ethereum/erc20/convert.tsx     |   2 +-
 .../flow/blockchain/ethereum/erc20/index.ts   |   0
 .../flow/blockchain/ethereum/index.ts         |   0
 .../blockchain/ethereum/modify/cancel.tsx     |   0
 .../flow/blockchain/ethereum/modify/index.ts  |   0
 .../blockchain/ethereum/modify/modify.tsx     |   2 +-
 .../blockchain/ethereum/modify/speedup.tsx    |   0
 .../flow/blockchain/ethereum/transfer.tsx     |   2 +-
 .../SetupTransaction/flow/blockchain/index.ts |   0
 .../SetupTransaction/flow/common/index.ts     |   0
 .../SetupTransaction/flow/common/modify.tsx   |   0
 .../SetupTransaction/flow/common/transfer.tsx |   2 +-
 .../flow/components/Actions.tsx               |   0
 .../flow/components/Amount.tsx                |  12 +-
 .../flow/components/ApproveAmount.tsx         |  40 +-
 .../flow/components/BitcoinFee.tsx            |   0
 .../flow/components/EthereumFee.tsx           |   2 +-
 .../SetupTransaction/flow/components/To.tsx   |   2 +-
 .../SetupTransaction/flow/components/index.ts |   0
 .../SetupTransaction/flow/flow.tsx            |   0
 .../SetupTransaction/flow/index.ts            |   0
 .../SetupTransaction/flow/types.ts            |   2 +-
 .../SetupTransaction/index.ts                 |   0
 .../SignTransaction/SignTransaction.tsx       |   0
 .../display/blockchain/bitcoin.tsx            |   0
 .../blockchain/ethereum/erc20/approve.tsx     |   0
 .../blockchain/ethereum/erc20/convert.tsx     |   0
 .../blockchain/ethereum/erc20/index.ts        |   0
 .../display/blockchain/ethereum/ethereum.tsx  |   0
 .../display/blockchain/ethereum/index.ts      |   0
 .../display/blockchain/index.ts               |   0
 .../SignTransaction/display/common.tsx        |   0
 .../display/components/Actions.tsx            |   2 +-
 .../display/components/AddressPreview.tsx     |   0
 .../display/components/index.ts               |   0
 .../SignTransaction/display/display.ts        |   0
 .../SignTransaction/display/index.ts          |   0
 .../SignTransaction/display/types.ts          |   0
 .../SignTransaction/index.ts                  |   0
 .../{CreateTransaction => }/index.ts          |   0
 .../WalletDetails/entry/EthereumEntryItem.tsx |  13 +-
 packages/store/src/screen/types.ts            |   2 -
 80 files changed, 64 insertions(+), 1398 deletions(-)
 delete mode 100644 packages/react-app/src/common/AmountField/AmountField.spec.tsx
 delete mode 100644 packages/react-app/src/common/AmountField/AmountField.tsx
 delete mode 100644 packages/react-app/src/common/AmountField/index.ts
 delete mode 100644 packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx
 delete mode 100644 packages/react-app/src/common/BtcConfirm/RawTx.tsx
 delete mode 100644 packages/react-app/src/common/BtcConfirm/RawTxDetails.tsx
 delete mode 100644 packages/react-app/src/common/BtcConfirm/index.ts
 delete mode 100644 packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.spec.tsx
 delete mode 100644 packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.tsx
 delete mode 100644 packages/react-app/src/transaction/BroadcastEthTx/index.ts
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/BroadcastTransaction.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/blockchain/bitcoin.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/blockchain/ethereum.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/blockchain/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/common.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/components/Actions.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/components/BitcoinDecoded.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/components/EthereumDecoded.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/components/RawTx.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/components/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/display.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/display/types.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/BroadcastTransaction/index.ts (100%)
 delete mode 100644 packages/react-app/src/transaction/CreateRecoverTransaction/CreateRecoverTransaction.tsx
 delete mode 100644 packages/react-app/src/transaction/CreateRecoverTransaction/index.ts
 rename packages/react-app/src/transaction/{CreateTransaction => }/CreateTransaction.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/SetupTransaction.tsx (99%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/modify/cancel.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/modify/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx (95%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/modify/speedup.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/bitcoin/transfer.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx (95%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx (98%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/erc20/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/modify/cancel.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/modify/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx (95%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/modify/speedup.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/ethereum/transfer.tsx (96%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/blockchain/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/common/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/common/modify.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/common/transfer.tsx (97%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/Actions.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/Amount.tsx (81%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/ApproveAmount.tsx (67%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/BitcoinFee.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/EthereumFee.tsx (97%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/To.tsx (92%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/components/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/flow.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/flow/types.ts (96%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SetupTransaction/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/SignTransaction.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/bitcoin.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/ethereum/erc20/approve.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/ethereum/erc20/convert.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/ethereum/erc20/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/ethereum/ethereum.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/ethereum/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/blockchain/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/common.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/components/Actions.tsx (98%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/components/AddressPreview.tsx (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/components/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/display.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/display/types.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/SignTransaction/index.ts (100%)
 rename packages/react-app/src/transaction/{CreateTransaction => }/index.ts (100%)

diff --git a/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts
index 97e397b02..0e625fe65 100644
--- a/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts
+++ b/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts
@@ -174,7 +174,7 @@ export class CreateErc20ApproveTx implements Erc20ApproveTxDetails {
     if (TokenAmount.is(value)) {
       this._amount = value;
     } else {
-      this._amount = this.token.getAmount(value);
+      this._amount = this.token.getAmount(1).multiply(this.token.getUnits().top.multiplier).multiply(value);
     }
 
     this._target = ApproveTarget.MANUAL;
diff --git a/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts
index 291237503..e09469bcd 100644
--- a/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts
+++ b/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts
@@ -1,4 +1,4 @@
-import { BigAmount, CreateAmount } from '@emeraldpay/bigamount';
+import { BigAmount, CreateAmount, Units } from '@emeraldpay/bigamount';
 import { WeiAny } from '@emeraldpay/bigamount-crypto';
 import BigNumber from 'bignumber.js';
 import {
@@ -156,13 +156,14 @@ export class CreateErc20ConvertTx implements Erc20ConvertTxDetails {
     } else {
       const { asset, token } = this;
 
-      const { units } = this.amount;
-
       let amount: BigAmount;
+      let units: Units;
 
       if (asset.toLowerCase() === token.address.toLowerCase()) {
         amount = token.getAmount(1);
+        units = token.getUnits();
       } else {
+        units = this.amount.units;
         amount = new WeiAny(1, units);
       }
 
diff --git a/packages/react-app/src/app/screen/Screen/Screen.tsx b/packages/react-app/src/app/screen/Screen/Screen.tsx
index 565765d09..4536758c0 100644
--- a/packages/react-app/src/app/screen/Screen/Screen.tsx
+++ b/packages/react-app/src/app/screen/Screen/Screen.tsx
@@ -13,9 +13,7 @@ import ShowMessage from '../../../message/ShowMessage';
 import SignMessage from '../../../message/SignMessage';
 import ReceiveScreen from '../../../receive/ReceiveScreen';
 import Settings from '../../../settings/Settings';
-import { BroadcastEthTx } from '../../../transaction/BroadcastEthTx';
-import CreateRecoverTransaction from '../../../transaction/CreateRecoverTransaction';
-import { CreateTransaction } from '../../../transaction/CreateTransaction';
+import { CreateTransaction } from '../../../transaction';
 import TxDetails from '../../../transactions/TxDetails';
 import WalletDetails from '../../../wallets/WalletDetails';
 import WalletInfo from '../../../wallets/WalletInfo';
@@ -57,12 +55,8 @@ const Screen: React.FC<OwnProps & StateProps> = ({ restoreData, screenItem, term
       return <AddHDAddress walletId={screenItem} />;
     case screen.Pages.ADDRESS_BOOK:
       return <AddressBook />;
-    case screen.Pages.BROADCAST_TX:
-      return <BroadcastEthTx data={screenItem} />;
     case screen.Pages.CREATE_TX:
       return <CreateTransaction {...screenItem} />;
-    case screen.Pages.CREATE_TX_RECOVER:
-      return <CreateRecoverTransaction entry={screenItem} />;
     case screen.Pages.CREATE_WALLET:
       return <CreateWalletScreen />;
     case screen.Pages.EDIT_ADDRESS:
diff --git a/packages/react-app/src/common/AmountField/AmountField.spec.tsx b/packages/react-app/src/common/AmountField/AmountField.spec.tsx
deleted file mode 100644
index b9924579b..000000000
--- a/packages/react-app/src/common/AmountField/AmountField.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { WEIS, Wei } from '@emeraldpay/bigamount-crypto';
-import { Theme } from '@emeraldwallet/ui';
-import { ThemeProvider } from '@material-ui/core';
-import { mount, shallow } from 'enzyme';
-import * as React from 'react';
-import { Provider } from 'react-redux';
-import { createTestStore } from '../../testStore';
-import AmountField from './AmountField';
-
-describe('AmountField', () => {
-  it('should renders without crash', () => {
-    const wrapper = shallow(
-      <Provider store={createTestStore()}>
-        <ThemeProvider theme={Theme}>
-          <AmountField amount={Wei.ZERO} units={WEIS} onChangeAmount={jest.fn()} onMaxClick={jest.fn()} />
-        </ThemeProvider>
-      </Provider>,
-    );
-
-    expect(wrapper).toBeDefined();
-  });
-
-  it('should call onChangeAmount', () => {
-    const onChangeAmount = jest.fn();
-
-    const wrapper = mount(
-      <Provider store={createTestStore()}>
-        <ThemeProvider theme={Theme}>
-          <AmountField amount={Wei.ZERO} units={WEIS} onChangeAmount={onChangeAmount} onMaxClick={jest.fn()} />
-        </ThemeProvider>
-      </Provider>,
-    );
-
-    wrapper.find('input').simulate('change', { target: { value: '567' } });
-
-    expect(onChangeAmount.mock.calls.length).toBe(1);
-    expect(typeof onChangeAmount.mock.calls[0][0]).toBe('object');
-    expect(onChangeAmount.mock.calls[0][0].toString()).toBe('567 ETH');
-    expect(onChangeAmount.mock.calls[0][0]).toEqual(new Wei('567', 'ETHER'));
-  });
-});
diff --git a/packages/react-app/src/common/AmountField/AmountField.tsx b/packages/react-app/src/common/AmountField/AmountField.tsx
deleted file mode 100644
index aca58f7cf..000000000
--- a/packages/react-app/src/common/AmountField/AmountField.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { BigAmount, Units } from '@emeraldpay/bigamount';
-import { formatAmountValue } from '@emeraldwallet/core';
-import { Button, Input } from '@emeraldwallet/ui';
-import * as React from 'react';
-import { connect } from 'react-redux';
-
-interface OwnProps {
-  amount?: BigAmount;
-  disabled?: boolean;
-  maxAmount?: BigAmount;
-  maxDisabled?: boolean;
-  fieldWidth?: number;
-  units: Units;
-  onChangeAmount(value: BigAmount): void;
-  onMaxClick(callback: (value: BigAmount) => void): void;
-}
-
-interface DispatchProps {
-  onClear(): void;
-}
-
-const AmountField: React.FC<OwnProps & DispatchProps> = ({
-  amount,
-  maxAmount,
-  units,
-  disabled = false,
-  maxDisabled = false,
-  fieldWidth = 440,
-  onChangeAmount,
-  onClear,
-  onMaxClick,
-}) => {
-  const changed = React.useRef(false);
-
-  const [currentAmount, setCurrentAmount] = React.useState(amount == null ? '0' : formatAmountValue(amount));
-  const [currentMaxAmount, setCurrentMaxAmount] = React.useState(
-    maxAmount == null ? null : formatAmountValue(maxAmount),
-  );
-
-  const [errorText, setErrorText] = React.useState<string | null>(null);
-
-  const handleAmountChange = ({ target: { value } }: React.ChangeEvent<HTMLInputElement>): void => {
-    const newAmount = value.trim();
-
-    changed.current = true;
-
-    setCurrentAmount(newAmount);
-
-    if (newAmount === '') {
-      setErrorText('Required');
-
-      onClear();
-
-      return;
-    }
-
-    const valid = newAmount.match(/^\d*(\.\d+)?$/);
-
-    if (!valid) {
-      setErrorText('Invalid number');
-
-      onClear();
-
-      return;
-    }
-
-    try {
-      const parsed = parseFloat(newAmount);
-
-      if (parsed < 0) {
-        setErrorText('Value must be positive number');
-
-        onClear();
-      } else {
-        setErrorText(null);
-
-        // Relative to the main unit. I.e. "20" should be 20 Ether, not 20 Wei
-        onChangeAmount(new BigAmount(1, units).multiply(units.top.multiplier).multiply(parsed));
-      }
-    } catch (exception) {
-      setErrorText('Invalid value');
-
-      onClear();
-    }
-  };
-
-  const handleMaxClick = (): void => {
-    onMaxClick((value) => {
-      const newAmount = formatAmountValue(value);
-
-      changed.current = true;
-
-      setCurrentAmount(newAmount);
-      setCurrentMaxAmount(newAmount);
-
-      setErrorText(null);
-    });
-  };
-
-  React.useEffect(() => {
-    if (!changed.current && amount != null) {
-      const newAmount = formatAmountValue(amount);
-
-      if (newAmount !== currentAmount) {
-        setCurrentAmount(newAmount);
-      }
-    }
-  }, [amount, currentAmount]);
-
-  return (
-    <div style={{ width: fieldWidth }}>
-      <Input
-        disabled={disabled}
-        errorText={errorText}
-        rightIcon={
-          <Button
-            disabled={disabled || maxDisabled}
-            label="Max"
-            primary={currentAmount === currentMaxAmount}
-            size="small"
-            variant="text"
-            onClick={handleMaxClick}
-          />
-        }
-        value={currentAmount}
-        onChange={handleAmountChange}
-      />
-    </div>
-  );
-};
-
-export default connect<unknown, DispatchProps, OwnProps>(null, (dispatch, { units, onChangeAmount }) => ({
-  onClear() {
-    onChangeAmount(new BigAmount(0, units));
-  },
-}))(AmountField);
diff --git a/packages/react-app/src/common/AmountField/index.ts b/packages/react-app/src/common/AmountField/index.ts
deleted file mode 100644
index 137ed9621..000000000
--- a/packages/react-app/src/common/AmountField/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as AmountField } from './AmountField';
diff --git a/packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx b/packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx
deleted file mode 100644
index ec999deca..000000000
--- a/packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { EntryId, EntryIdOp } from '@emeraldpay/emerald-vault-core';
-import { BlockchainCode } from '@emeraldwallet/core';
-import { screen } from '@emeraldwallet/store';
-import { Button, ButtonGroup, FormLabel, FormRow } from '@emeraldwallet/ui';
-import { createStyles } from '@material-ui/core';
-import { makeStyles } from '@material-ui/core/styles';
-import * as React from 'react';
-import { connect } from 'react-redux';
-import RawTx from './RawTx';
-import RawTxDetails from './RawTxDetails';
-
-const useStyles = makeStyles(
-  createStyles({
-    buttons: {
-      display: 'flex',
-      justifyContent: 'end',
-      width: '100%',
-    },
-  }),
-);
-
-interface OwnProps {
-  blockchain: BlockchainCode;
-  disabled?: boolean;
-  entryId: EntryId;
-  rawTx: string;
-  onConfirm(): void;
-}
-
-interface DispatchProps {
-  onCancel(): void;
-}
-
-const BtcConfirm: React.FC<OwnProps & DispatchProps> = ({
-  entryId,
-  blockchain,
-  rawTx,
-  onCancel,
-  onConfirm,
-  disabled = false,
-}) => {
-  const styles = useStyles();
-
-  const [showRaw, setShowRaw] = React.useState(false);
-
-  return (
-    <>
-      <RawTxDetails rawTx={rawTx} entryId={entryId} blockchain={blockchain} />
-      {showRaw ? (
-        <>
-          <FormRow>
-            <FormLabel top>Raw Tx</FormLabel>
-            <RawTx rawTx={rawTx} />
-          </FormRow>
-          <FormRow>
-            <FormLabel />
-            <Button label="Hide Raw" variant="outlined" onClick={() => setShowRaw(false)} />
-          </FormRow>
-        </>
-      ) : (
-        <FormRow>
-          <FormLabel>Raw Tx</FormLabel>
-          <Button label="Show Raw" variant="outlined" onClick={() => setShowRaw(true)} />
-        </FormRow>
-      )}
-      <FormRow last>
-        <ButtonGroup classes={{ container: styles.buttons }}>
-          <Button label="Cancel" onClick={onCancel} />
-          <Button label="Send" primary disabled={disabled} onClick={onConfirm} />
-        </ButtonGroup>
-      </FormRow>
-    </>
-  );
-};
-
-export default connect<unknown, DispatchProps, OwnProps>(null, (dispatch, ownProps) => ({
-  onCancel() {
-    const walletId = EntryIdOp.asOp(ownProps.entryId).extractWalletId();
-
-    dispatch(screen.actions.gotoScreen(screen.Pages.WALLET, walletId));
-  },
-}))(BtcConfirm);
diff --git a/packages/react-app/src/common/BtcConfirm/RawTx.tsx b/packages/react-app/src/common/BtcConfirm/RawTx.tsx
deleted file mode 100644
index 2a9374be7..000000000
--- a/packages/react-app/src/common/BtcConfirm/RawTx.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Theme } from '@emeraldwallet/ui';
-import { TextField, createStyles } from '@material-ui/core';
-import { makeStyles } from '@material-ui/core/styles';
-import * as React from 'react';
-
-const useStyles = makeStyles<typeof Theme>((theme) =>
-  createStyles({
-    rawTxText: {
-      fontSize: '12px',
-      ...theme.monotype,
-    },
-  }),
-);
-
-interface OwnProps {
-  rawTx: string;
-}
-
-const RawTx: React.FC<OwnProps> = ({ rawTx }) => {
-  const styles = useStyles();
-
-  return (
-    <TextField
-      fullWidth
-      multiline
-      disabled
-      minRows={4}
-      value={rawTx}
-      InputProps={{
-        classes: {
-          input: styles.rawTxText,
-        },
-      }}
-    />
-  );
-};
-
-export default RawTx;
diff --git a/packages/react-app/src/common/BtcConfirm/RawTxDetails.tsx b/packages/react-app/src/common/BtcConfirm/RawTxDetails.tsx
deleted file mode 100644
index a0b35a170..000000000
--- a/packages/react-app/src/common/BtcConfirm/RawTxDetails.tsx
+++ /dev/null
@@ -1,146 +0,0 @@
-import { BigAmount } from '@emeraldpay/bigamount';
-import { EntryId } from '@emeraldpay/emerald-vault-core/lib/types';
-import { BlockchainCode, amountDecoder, amountFactory } from '@emeraldwallet/core';
-import { IState, accounts } from '@emeraldwallet/store';
-import { Address, Balance, FormLabel, FormRow, TxRef } from '@emeraldwallet/ui';
-import { Typography, createStyles, makeStyles } from '@material-ui/core';
-import { Alert } from '@material-ui/lab';
-import * as bitcoin from 'bitcoinjs-lib';
-import * as React from 'react';
-import { connect } from 'react-redux';
-
-const useStyles = makeStyles(
-  createStyles({
-    balances: {
-      width: '100%',
-    },
-    balanceItem: {
-      display: 'flex',
-      '& + &': {
-        marginTop: 20,
-      },
-    },
-    balanceItemAddress: {
-      display: 'flex',
-      flex: 1,
-      flexDirection: 'column',
-    },
-  }),
-);
-
-interface ParsedInput {
-  address?: string;
-  amount: BigAmount;
-  txid: string;
-  vout: number;
-}
-
-interface ParsedOutput {
-  address: string;
-  amount: BigAmount;
-}
-
-interface Parsed {
-  fee?: BigAmount;
-  inputs: ParsedInput[];
-  outputs: ParsedOutput[];
-}
-
-interface OwnProps {
-  blockchain: BlockchainCode;
-  entryId: EntryId;
-  rawTx: string;
-}
-
-interface StateProps {
-  parsed: Parsed;
-}
-
-const RawTxDetails: React.FC<OwnProps & StateProps> = ({ parsed }) => {
-  const styles = useStyles();
-
-  return (
-    <>
-      <FormRow>
-        <FormLabel top={0}>From</FormLabel>
-        <div className={styles.balances}>
-          {parsed.inputs.map((input) => (
-            <div key={`${input.txid}:${input.vout}`} className={styles.balanceItem}>
-              <div className={styles.balanceItemAddress}>
-                {input.address == null ? (
-                  <TxRef txid={input.txid} vout={input.vout} />
-                ) : (
-                  <Address address={input.address} />
-                )}
-              </div>
-              <Balance balance={input.amount} />
-            </div>
-          ))}
-        </div>
-      </FormRow>
-      <FormRow>
-        <FormLabel top={0}>To</FormLabel>
-        <div className={styles.balances}>
-          {parsed.outputs.map((output, index) => (
-            <div key={`${output.address}-${index}`} className={styles.balanceItem}>
-              <div className={styles.balanceItemAddress}>
-                <Address address={output.address} />
-              </div>
-              <Balance balance={output.amount} />
-            </div>
-          ))}
-        </div>
-      </FormRow>
-      <FormRow>
-        <FormLabel>Fee</FormLabel>
-        {parsed.fee ? (
-          <Typography>{parsed.fee.toString()}</Typography>
-        ) : (
-          <Alert severity={'warning'} color={'warning'}>
-            Unknown Fee. May be invalid.
-          </Alert>
-        )}
-      </FormRow>
-    </>
-  );
-};
-
-export default connect<StateProps, unknown, OwnProps, IState>((state, { blockchain, entryId, rawTx }) => {
-  const factory = amountFactory(blockchain);
-  const decoder = amountDecoder(blockchain);
-
-  const network = blockchain === BlockchainCode.TestBTC ? bitcoin.networks.testnet : bitcoin.networks.bitcoin;
-
-  const tx = bitcoin.Transaction.fromHex(rawTx);
-  const utxo = accounts.selectors.getUtxo(state, entryId);
-
-  const inputs = tx.ins.map((input) => {
-    const txId = input.hash.reverse().toString('hex');
-    const balance = utxo.find((item) => item.txid == txId && item.vout == input.index);
-
-    return {
-      address: balance?.address,
-      amount: balance ? decoder(balance.value) : factory(0),
-      txid: txId,
-      vout: input.index,
-    };
-  });
-
-  const outputs = tx.outs.map((output) => ({
-    address: bitcoin.address.fromOutputScript(output.script, network),
-    amount: factory(output.value),
-  }));
-
-  const sent = inputs.map((input) => input.amount).reduce((carry, amount) => carry.plus(amount), factory(0));
-  const receive = outputs.map((output) => output.amount).reduce((carry, amount) => carry.plus(amount), factory(0));
-
-  const knownInputs = inputs.every((input) => input.address != null);
-
-  return {
-    parsed: {
-      inputs,
-      outputs,
-      fee: knownInputs ? sent.minus(receive) : undefined,
-    },
-  };
-})(RawTxDetails);
diff --git a/packages/react-app/src/common/BtcConfirm/index.ts b/packages/react-app/src/common/BtcConfirm/index.ts
deleted file mode 100644
index 6ed3da614..000000000
--- a/packages/react-app/src/common/BtcConfirm/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as BtcConfirm } from './BtcConfirm';
diff --git a/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.spec.tsx b/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.spec.tsx
deleted file mode 100644
index 555b6dfd0..000000000
--- a/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.spec.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import { BlockchainCode, EthereumTransactionType, amountFactory } from '@emeraldwallet/core';
-import { BroadcastData, application } from '@emeraldwallet/store';
-import { Theme } from '@emeraldwallet/ui';
-import { ThemeProvider } from '@material-ui/core';
-import '@testing-library/jest-dom/extend-expect';
-import { render } from '@testing-library/react';
-import * as React from 'react';
-import { Provider } from 'react-redux';
-import { createTestStore } from '../../testStore';
-import BroadcastEthTx from './BroadcastEthTx';
-
-describe('BroadcastTx', () => {
-  const factory = amountFactory(BlockchainCode.Goerli);
-
-  const data: BroadcastData = {
-    blockchain: BlockchainCode.Goerli,
-    entryId: '1022fd13-3431-4f3b-bce8-109fdab15873-1',
-    fee: factory('1000000000000000000'),
-    signed:
-      '0x02f8720580845a288bce8502d16b842682520894e7f129f88b57e902cb18ba' +
-      'eecd43f17449419ae287b1a2bc2ec5000080c001a056663c0965287c9e0e92d6' +
-      'c6ecf157759ea79c21264c7026061a8732f8d2539da03b44d23d74d2e47af661' +
-      '0fa2c4b1f0a352ee0be3fc0457ff81d5813dde597d4b',
-    tx: {
-      blockchain: BlockchainCode.Goerli,
-      data: '',
-      from: '0x65a60f440ed54910d91a0634a45a2294cc807095',
-      gas: 21000,
-      maxGasPrice: factory('10000000000'),
-      nonce: 0,
-      priorityGasPrice: factory('1000000000'),
-      to: '0xe7f129f88b57e902cb18baeecd43f17449419ae2',
-      type: EthereumTransactionType.EIP1559,
-      value: factory('50000000000000000'),
-    },
-    txId: '0xc9c924dd7f4ffe61d653718b204d6aae514736db227fdb0297b76cd8f3f1f203',
-  };
-
-  const store = createTestStore({
-    [application.moduleName]: {
-      tokens: [],
-    },
-  });
-
-  it('should work without crash', () => {
-    const wrapper = render(
-      <Provider store={store}>
-        <ThemeProvider theme={Theme}>
-          <BroadcastEthTx data={data} />
-        </ThemeProvider>
-      </Provider>,
-    );
-
-    expect(wrapper).toBeDefined();
-  });
-
-  it('should display tx value for ordinary tx', async () => {
-    const wrapper = render(
-      <Provider store={store}>
-        <ThemeProvider theme={Theme}>
-          <BroadcastEthTx data={data} />
-        </ThemeProvider>
-      </Provider>,
-    );
-
-    const amount = await wrapper.findByTestId('amount');
-
-    expect(amount).toBeDefined();
-    expect(amount).toHaveTextContent('0.05 ETG');
-
-    const nonce = await wrapper.findByTestId('nonce');
-
-    expect(nonce).toHaveTextContent('0');
-  });
-});
diff --git a/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.tsx b/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.tsx
deleted file mode 100644
index 24f816725..000000000
--- a/packages/react-app/src/transaction/BroadcastEthTx/BroadcastEthTx.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import { BigAmount } from '@emeraldpay/bigamount';
-import {
-  Blockchains,
-  DecodedInput,
-  EthereumTx,
-  MAX_DISPLAY_ALLOWANCE,
-  TokenRegistry,
-  amountFactory,
-  decodeData,
-  formatAmountPartial,
-  toNumber,
-} from '@emeraldwallet/core';
-import { BroadcastData, IState, screen, transaction } from '@emeraldwallet/store';
-import { Account, Button, ButtonGroup, FormLabel, FormRow, Page } from '@emeraldwallet/ui';
-import { TextField, Typography, WithStyles, createStyles } from '@material-ui/core';
-import { withStyles } from '@material-ui/core/styles';
-import * as React from 'react';
-import { connect } from 'react-redux';
-import ChainTitle from '../../common/ChainTitle';
-
-export const styles = createStyles({
-  buttons: {
-    display: 'flex',
-    justifyContent: 'end',
-    width: '100%',
-  },
-  label: {
-    color: '#747474',
-    fontSize: '16px',
-    textAlign: 'right',
-  },
-});
-
-interface OwnProps {
-  data: BroadcastData;
-}
-
-interface StateProps {
-  tokenRegistry: TokenRegistry;
-}
-
-interface DispatchProps {
-  onCancel(): void;
-  onSendTx(data: BroadcastData): void;
-}
-
-class BroadcastTx extends React.Component<OwnProps & StateProps & DispatchProps & WithStyles<typeof styles>> {
-  public render(): React.ReactNode {
-    const {
-      classes,
-      data: { blockchain, signed },
-      tokenRegistry,
-    } = this.props;
-
-    const factory = amountFactory(blockchain);
-
-    const { chainId, code } = Blockchains[blockchain].params;
-
-    const decoded = EthereumTx.fromRaw(signed, chainId);
-    const data = decoded.getData();
-
-    let amount: BigAmount = factory(toNumber(decoded.getValue()));
-    let to = decoded.getRecipientAddress().toString();
-
-    let owner: string | undefined;
-    let method: string | undefined;
-
-    if (data.length > 0) {
-      const decodedData = decodeData(data);
-
-      method = decodedData.name;
-
-      if (decodedData.inputs.length > 1 && tokenRegistry.hasAddress(code, to)) {
-        let dataFrom: DecodedInput | undefined;
-        let dataTo: DecodedInput | undefined;
-        let dataAmount: DecodedInput | undefined;
-
-        switch (method) {
-          case 'approve':
-          case 'transfer': {
-            [dataTo, dataAmount] = decodedData.inputs;
-
-            break;
-          }
-          case 'transferFrom': {
-            [dataFrom, dataTo, dataAmount] = decodedData.inputs;
-          }
-        }
-
-        if (dataTo != null && dataAmount != null) {
-          const tokenData = tokenRegistry.byAddress(code, to);
-
-          amount = tokenData.getAmount(dataAmount);
-          owner = dataFrom?.toString(16);
-          to = dataTo.toString(16);
-        }
-      }
-    }
-
-    const [amountValue, amountUnit] = formatAmountPartial(amount);
-
-    return (
-      <Page title={<ChainTitle blockchain={blockchain} title="Publish Transaction" />}>
-        <FormRow>
-          <FormLabel>From</FormLabel>
-          <Account identity={true} address={decoded.getSenderAddress().toString()} />
-        </FormRow>
-        {owner != null && (
-          <FormRow>
-            <FormLabel>Owner</FormLabel>
-            <Account identity={true} address={owner} />
-          </FormRow>
-        )}
-        <FormRow>
-          <FormLabel>To</FormLabel>
-          <Account identity={true} address={to} />
-        </FormRow>
-        <FormRow>
-          <FormLabel>{method === 'approve' ? 'Approving' : 'Amount'}</FormLabel>
-          <Typography>
-            <span data-testid="amount">
-              {amount.number.isGreaterThanOrEqualTo(MAX_DISPLAY_ALLOWANCE) ? <>&infin;</> : amountValue} {amountUnit}
-            </span>
-          </Typography>
-        </FormRow>
-        <FormRow>
-          <FormLabel>Nonce</FormLabel>
-          <Typography>
-            <span data-testid="nonce">{decoded.getNonce()}</span>
-          </Typography>
-        </FormRow>
-        <FormRow>
-          <FormLabel top>Raw Tx</FormLabel>
-          <TextField disabled fullWidth multiline maxRows={7} minRows={7} value={signed} />
-        </FormRow>
-        <FormRow last>
-          <ButtonGroup classes={{ container: classes.buttons }}>
-            <Button label="Cancel" onClick={this.handleCancelClick} />
-            <Button primary label="Send" onClick={this.handleSendClick} />
-          </ButtonGroup>
-        </FormRow>
-      </Page>
-    );
-  }
-
-  private handleCancelClick = (): void => {
-    this.props.onCancel();
-  };
-
-  private handleSendClick = (): void => {
-    this.props.onSendTx(this.props.data);
-  };
-}
-
-export default connect<StateProps, DispatchProps, unknown, IState>(
-  (state) => ({
-    tokenRegistry: new TokenRegistry(state.application.tokens),
-  }),
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (dispatch: any) => ({
-    onCancel() {
-      dispatch(screen.actions.gotoWalletsScreen());
-    },
-    onSendTx(data) {
-      dispatch(transaction.actions.broadcastTx(data));
-    },
-  }),
-)(withStyles(styles)(BroadcastTx));
diff --git a/packages/react-app/src/transaction/BroadcastEthTx/index.ts b/packages/react-app/src/transaction/BroadcastEthTx/index.ts
deleted file mode 100644
index d009f8400..000000000
--- a/packages/react-app/src/transaction/BroadcastEthTx/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as BroadcastEthTx } from './BroadcastEthTx';
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/BroadcastTransaction.tsx b/packages/react-app/src/transaction/BroadcastTransaction/BroadcastTransaction.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/BroadcastTransaction.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/BroadcastTransaction.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/bitcoin.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/bitcoin.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/bitcoin.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/bitcoin.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/ethereum.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/ethereum.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/ethereum.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/ethereum.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/index.ts b/packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/blockchain/index.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/display/blockchain/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/common.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/common.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/common.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/common.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/Actions.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/components/Actions.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/Actions.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/components/Actions.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/BitcoinDecoded.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/components/BitcoinDecoded.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/BitcoinDecoded.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/components/BitcoinDecoded.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/EthereumDecoded.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/components/EthereumDecoded.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/EthereumDecoded.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/components/EthereumDecoded.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/RawTx.tsx b/packages/react-app/src/transaction/BroadcastTransaction/display/components/RawTx.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/RawTx.tsx
rename to packages/react-app/src/transaction/BroadcastTransaction/display/components/RawTx.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/index.ts b/packages/react-app/src/transaction/BroadcastTransaction/display/components/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/components/index.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/display/components/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/display.ts b/packages/react-app/src/transaction/BroadcastTransaction/display/display.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/display.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/display/display.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/index.ts b/packages/react-app/src/transaction/BroadcastTransaction/display/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/index.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/display/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/types.ts b/packages/react-app/src/transaction/BroadcastTransaction/display/types.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/display/types.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/display/types.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/index.ts b/packages/react-app/src/transaction/BroadcastTransaction/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/BroadcastTransaction/index.ts
rename to packages/react-app/src/transaction/BroadcastTransaction/index.ts
diff --git a/packages/react-app/src/transaction/CreateRecoverTransaction/CreateRecoverTransaction.tsx b/packages/react-app/src/transaction/CreateRecoverTransaction/CreateRecoverTransaction.tsx
deleted file mode 100644
index 991fc57d2..000000000
--- a/packages/react-app/src/transaction/CreateRecoverTransaction/CreateRecoverTransaction.tsx
+++ /dev/null
@@ -1,662 +0,0 @@
-import { BigAmount } from '@emeraldpay/bigamount';
-import { Wei } from '@emeraldpay/bigamount-crypto';
-import { WalletEntry, isEthereumEntry } from '@emeraldpay/emerald-vault-core';
-import {
-  BlockchainCode,
-  Blockchains,
-  DEFAULT_GAS_LIMIT,
-  EthereumTransaction,
-  EthereumTransactionType,
-  IBlockchain,
-  TokenAmount,
-  TokenData,
-  TokenRegistry,
-  amountFactory,
-  blockchainIdToCode,
-  formatAmount,
-  workflow,
-} from '@emeraldwallet/core';
-import { FEE_KEYS, GasPrices, IState, SignData, accounts, screen, tokens, transaction } from '@emeraldwallet/store';
-import {
-  AccountSelect,
-  Back,
-  Button,
-  ButtonGroup,
-  FormAccordion,
-  FormLabel,
-  FormRow,
-  Page,
-  PasswordInput,
-} from '@emeraldwallet/ui';
-import {
-  Box,
-  CircularProgress,
-  FormControlLabel,
-  FormHelperText,
-  MenuItem,
-  Slider,
-  Switch,
-  TextField,
-  Typography,
-  createStyles,
-  makeStyles,
-} from '@material-ui/core';
-import { Alert } from '@material-ui/lab';
-import * as React from 'react';
-import { useState } from 'react';
-import { connect } from 'react-redux';
-import WaitLedger from '../../ledger/WaitLedger';
-
-const useStyles = makeStyles(
-  createStyles({
-    inputField: {
-      flexGrow: 5,
-    },
-    gasPriceTypeBox: {
-      width: '240px',
-      float: 'left',
-      height: '40px',
-    },
-    gasPriceSliderBox: {
-      width: '300px',
-      float: 'left',
-    },
-    gasPriceHelpBox: {
-      width: '500px',
-      clear: 'left',
-    },
-    gasPriceSlider: {
-      width: '300px',
-      marginBottom: '10px',
-      paddingTop: '10px',
-    },
-    gasPriceHelp: {
-      position: 'initial',
-      paddingLeft: '10px',
-    },
-    gasPriceMarkLabel: {
-      fontSize: '0.7em',
-      opacity: 0.8,
-    },
-    gasPriceValueLabel: {
-      fontSize: '0.7em',
-    },
-    buttons: {
-      display: 'flex',
-      justifyContent: 'end',
-      width: '100%',
-    },
-  }),
-);
-
-enum Stages {
-  SETUP = 'setup',
-  SIGN = 'sign',
-}
-
-interface OwnProps {
-  entry: WalletEntry;
-}
-
-interface StateProps {
-  addresses: Record<string, string>;
-  balanceByToken: Record<string, BigAmount>;
-  eip1559: boolean;
-  isHardware: boolean;
-  recoverBlockchain: IBlockchain;
-  tokenDataList: TokenData[];
-  wrongBlockchain: IBlockchain;
-  getBalancesByAddress(address: string): string[];
-}
-
-interface DispatchProps {
-  estimateGas(blockchain: BlockchainCode, tx: EthereumTransaction): Promise<number>;
-  getFees(blockchain: BlockchainCode): Promise<Record<(typeof FEE_KEYS)[number], GasPrices>>;
-  goBack(): void;
-  signTransaction(tx: workflow.CreateEtherTx, password?: string): Promise<void>;
-  verifyGlobalKey(password: string): Promise<boolean>;
-}
-
-const CreateRecoverTransaction: React.FC<OwnProps & StateProps & DispatchProps> = ({
-  addresses,
-  balanceByToken,
-  eip1559,
-  entry: { address: fromAddress },
-  isHardware,
-  recoverBlockchain,
-  tokenDataList,
-  wrongBlockchain,
-  estimateGas,
-  getBalancesByAddress,
-  getFees,
-  goBack,
-  signTransaction,
-  verifyGlobalKey,
-}) => {
-  const styles = useStyles();
-
-  const mounted = React.useRef(true);
-
-  const [stage, setStage] = useState(Stages.SETUP);
-
-  const [initializing, setInitializing] = React.useState(true);
-  const [verifying, setVerifying] = React.useState(false);
-
-  const [address, setAddress] = React.useState(Object.keys(addresses)[0]);
-  const [token, setToken] = React.useState(tokenDataList[0]);
-
-  const [password, setPassword] = React.useState<string>();
-  const [passwordError, setPasswordError] = React.useState<string>();
-
-  const [transaction, setTransaction] = React.useState(
-    new workflow.CreateEtherTx(null, wrongBlockchain.params.code).dump(),
-  );
-
-  const [useEip1559, setUseEip1559] = React.useState(eip1559);
-
-  const zeroWei = new Wei(0);
-
-  const [stdMaxGasPrice, setStdMaxGasPrice] = React.useState(zeroWei);
-  const [highMaxGasPrice, setHighMaxGasPrice] = React.useState(zeroWei);
-  const [lowMaxGasPrice, setLowMaxGasPrice] = React.useState(zeroWei);
-
-  const [stdPriorityGasPrice, setStdPriorityGasPrice] = React.useState(zeroWei);
-  const [highPriorityGasPrice, setHighPriorityGasPrice] = React.useState(zeroWei);
-  const [lowPriorityGasPrice, setLowPriorityGasPrice] = React.useState(zeroWei);
-
-  const [gasPriceUnit, setGasPriceUnit] = React.useState(Wei.ZERO.units.base);
-
-  const [maxGasPrice, setMaxGasPrice] = React.useState(0);
-  const [useStdMaxGasPrice, setUseStdMaxGasPrice] = React.useState(true);
-
-  const [priorityGasPrice, setPriorityGasPrice] = React.useState(0);
-  const [useStdPriorityGasPrice, setUseStdPriorityGasPrice] = React.useState(true);
-
-  const onTokenChange = ({ target: { value } }: React.ChangeEvent<HTMLInputElement>): void => {
-    const tokenData = tokenDataList.find((item) => item.symbol === value);
-
-    if (tokenData != null) {
-      setToken(tokenData);
-    }
-  };
-
-  const onCreateTransaction = async (): Promise<void> => {
-    if (fromAddress == null) {
-      return;
-    }
-
-    const balance = new Wei(balanceByToken[token.symbol]);
-
-    const tx = new workflow.CreateEtherTx({
-      amount: balance,
-      blockchain: wrongBlockchain.params.code,
-      from: fromAddress.value,
-      gas: DEFAULT_GAS_LIMIT,
-      meta: { type: workflow.TxMetaType.ETHER_RECOVERY },
-      to: address,
-      target: workflow.TxTarget.SEND_ALL,
-      type: eip1559 ? EthereumTransactionType.EIP1559 : EthereumTransactionType.LEGACY,
-    });
-
-    if (eip1559) {
-      tx.maxGasPrice = new Wei(maxGasPrice, gasPriceUnit);
-      tx.priorityGasPrice = new Wei(priorityGasPrice, gasPriceUnit);
-    } else {
-      tx.gasPrice = new Wei(maxGasPrice, gasPriceUnit);
-    }
-
-    tx.setTotalBalance(balance);
-
-    tx.gas = await estimateGas(wrongBlockchain.params.code, tx.build());
-
-    tx.rebalance();
-
-    setTransaction(tx.dump());
-
-    setStage(Stages.SIGN);
-  };
-
-  const onSignTransaction = async (): Promise<void> => {
-    setPasswordError(undefined);
-
-    const tx = workflow.CreateEtherTx.fromPlain(transaction);
-
-    if (isHardware) {
-      await signTransaction(tx);
-    } else {
-      if (password == null) {
-        return;
-      }
-
-      setVerifying(true);
-
-      const correctPassword = await verifyGlobalKey(password);
-
-      if (correctPassword) {
-        await signTransaction(tx, password);
-      } else {
-        setPasswordError('Incorrect password');
-      }
-
-      if (mounted.current) {
-        setVerifying(false);
-      }
-    }
-  };
-
-  const onPasswordEnter = async (): Promise<void> => {
-    if (!verifying && (password?.length ?? 0) > 0) {
-      await onSignTransaction();
-    }
-  };
-
-  React.useEffect(
-    () => {
-      (async (): Promise<void> => {
-        const fees = await getFees(recoverBlockchain.params.code);
-
-        const { avgLast, avgMiddle, avgTail5 } = fees;
-
-        const newStdMaxGasPrice = new Wei(avgTail5.max);
-        const newStdPriorityGasPrice = new Wei(avgTail5.priority);
-
-        setStdMaxGasPrice(newStdMaxGasPrice);
-        setHighMaxGasPrice(new Wei(avgMiddle.max));
-        setLowMaxGasPrice(new Wei(avgLast.max));
-
-        setStdPriorityGasPrice(newStdPriorityGasPrice);
-        setHighPriorityGasPrice(new Wei(avgMiddle.priority));
-        setLowPriorityGasPrice(new Wei(avgLast.priority));
-
-        const gasPriceOptimalUnit = newStdMaxGasPrice.getOptimalUnit(undefined, undefined, 6);
-        const maxGasPriceNumber = newStdMaxGasPrice.getNumberByUnit(gasPriceOptimalUnit).toNumber();
-        const priorityGasPriceNumber = newStdPriorityGasPrice.getNumberByUnit(gasPriceOptimalUnit).toNumber();
-
-        setGasPriceUnit(gasPriceOptimalUnit);
-
-        setMaxGasPrice(maxGasPriceNumber);
-        setPriorityGasPrice(priorityGasPriceNumber);
-
-        setInitializing(false);
-      })();
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [],
-  );
-
-  const tx = workflow.CreateEtherTx.fromPlain(transaction);
-
-  const stdMaxGasPriceNumber = stdMaxGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-  const highMaxGasPriceNumber = highMaxGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-  const lowMaxGasPriceNumber = lowMaxGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-
-  const stdPriorityGasPriceNumber = stdPriorityGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-  const highPriorityGasPriceNumber = highPriorityGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-  const lowPriorityGasPriceNumber = lowPriorityGasPrice.getNumberByUnit(gasPriceUnit).toNumber();
-
-  return (
-    <Page title="Create Recover Transaction" leftIcon={<Back onClick={goBack} />}>
-      {stage === Stages.SETUP && (
-        <>
-          {address == null ? (
-            <Alert severity="warning">
-              Address for recovery not found. Please add new address on {recoverBlockchain.getTitle()} blockchain and
-              try again.
-            </Alert>
-          ) : (
-            <>
-              <FormRow>
-                <FormLabel>Address</FormLabel>
-                <AccountSelect
-                  accounts={addresses}
-                  selectedAccount={address}
-                  getBalancesByAddress={getBalancesByAddress}
-                  onChange={setAddress}
-                />
-              </FormRow>
-              {tokenDataList.length > 1 && (
-                <FormRow>
-                  <FormLabel>Token</FormLabel>
-                  <TextField select value={token.symbol} onChange={onTokenChange}>
-                    {tokenDataList.map((item) => (
-                      <MenuItem key={item.symbol} value={item.symbol}>
-                        {item.symbol}
-                      </MenuItem>
-                    ))}
-                  </TextField>
-                </FormRow>
-              )}
-              <FormRow>
-                <FormLabel>Amount</FormLabel>
-                {formatAmount(balanceByToken[token.symbol])}
-              </FormRow>
-              <FormRow>
-                <FormLabel>Reason</FormLabel>
-                {recoverBlockchain.getTitle()} coins/tokens on {wrongBlockchain.getTitle()} address
-              </FormRow>
-              <FormAccordion
-                title={
-                  <FormRow last>
-                    <FormLabel>Settings</FormLabel>
-                    {useEip1559 ? 'EIP-1559' : 'Basic Type'} / {maxGasPrice.toFixed(2)} {gasPriceUnit.toString()}
-                    {useEip1559 ? ' Max Gas Price' : ' Gas Price'}
-                    {useEip1559
-                      ? ` / ${priorityGasPrice.toFixed(2)} ${gasPriceUnit.toString()} Priority Gas Price`
-                      : null}
-                  </FormRow>
-                }
-              >
-                <FormRow>
-                  <FormLabel>Use EIP-1559</FormLabel>
-                  <FormControlLabel
-                    control={
-                      <Switch
-                        checked={useEip1559}
-                        color="primary"
-                        disabled={initializing}
-                        onChange={({ target: { checked } }) => setUseEip1559(checked)}
-                      />
-                    }
-                    label={useEip1559 ? 'Enabled' : 'Disabled'}
-                  />
-                </FormRow>
-                <FormRow>
-                  <FormLabel top>{eip1559 ? 'Max gas price' : 'Gas price'}</FormLabel>
-                  <Box className={styles.inputField}>
-                    <Box className={styles.gasPriceTypeBox}>
-                      <FormControlLabel
-                        control={
-                          <Switch
-                            checked={useStdMaxGasPrice}
-                            color="primary"
-                            disabled={initializing}
-                            onChange={(event): void => {
-                              const checked = event.target.checked;
-
-                              setUseStdMaxGasPrice(checked);
-
-                              if (checked) {
-                                setMaxGasPrice(stdMaxGasPriceNumber);
-                              }
-                            }}
-                          />
-                        }
-                        label={useStdMaxGasPrice ? 'Standard Price' : 'Custom Price'}
-                      />
-                    </Box>
-                    {!useStdMaxGasPrice && (
-                      <Box className={styles.gasPriceSliderBox}>
-                        <Slider
-                          aria-labelledby="discrete-slider"
-                          classes={{
-                            markLabel: styles.gasPriceMarkLabel,
-                            valueLabel: styles.gasPriceValueLabel,
-                          }}
-                          className={styles.gasPriceSlider}
-                          defaultValue={stdMaxGasPriceNumber}
-                          marks={[
-                            { value: lowMaxGasPriceNumber, label: 'Slow' },
-                            { value: highMaxGasPriceNumber, label: 'Urgent' },
-                          ]}
-                          max={highMaxGasPriceNumber}
-                          min={lowMaxGasPriceNumber}
-                          step={0.01}
-                          valueLabelDisplay="auto"
-                          valueLabelFormat={(value): string => value.toFixed(2)}
-                          getAriaValueText={(): string => `${maxGasPrice.toFixed(2)} ${gasPriceUnit.toString()}`}
-                          onChange={(event, value): void => setMaxGasPrice(value as number)}
-                        />
-                      </Box>
-                    )}
-                    <Box className={styles.gasPriceHelpBox}>
-                      <FormHelperText className={styles.gasPriceHelp}>
-                        {maxGasPrice.toFixed(2)} {gasPriceUnit.toString()}
-                      </FormHelperText>
-                    </Box>
-                  </Box>
-                </FormRow>
-                {eip1559 && (
-                  <FormRow>
-                    <FormLabel top>Priority gas price</FormLabel>
-                    <Box className={styles.inputField}>
-                      <Box className={styles.gasPriceTypeBox}>
-                        <FormControlLabel
-                          control={
-                            <Switch
-                              checked={useStdPriorityGasPrice}
-                              color="primary"
-                              disabled={initializing}
-                              onChange={(event): void => {
-                                const checked = event.target.checked;
-
-                                if (checked) {
-                                  setPriorityGasPrice(stdPriorityGasPriceNumber);
-                                }
-
-                                setUseStdPriorityGasPrice(checked);
-                              }}
-                            />
-                          }
-                          label={useStdPriorityGasPrice ? 'Standard Price' : 'Custom Price'}
-                        />
-                      </Box>
-                      {!useStdPriorityGasPrice && (
-                        <Box className={styles.gasPriceSliderBox}>
-                          <Slider
-                            aria-labelledby="discrete-slider"
-                            classes={{
-                              markLabel: styles.gasPriceMarkLabel,
-                              valueLabel: styles.gasPriceValueLabel,
-                            }}
-                            className={styles.gasPriceSlider}
-                            defaultValue={stdPriorityGasPriceNumber}
-                            marks={[
-                              { value: lowPriorityGasPriceNumber, label: 'Slow' },
-                              { value: highPriorityGasPriceNumber, label: 'Urgent' },
-                            ]}
-                            max={highPriorityGasPriceNumber}
-                            min={lowPriorityGasPriceNumber}
-                            step={0.01}
-                            valueLabelDisplay="auto"
-                            valueLabelFormat={(value): string => value.toFixed(2)}
-                            getAriaValueText={(): string => `${priorityGasPrice.toFixed(2)} ${gasPriceUnit.toString()}`}
-                            onChange={(event, value): void => setPriorityGasPrice(value as number)}
-                          />
-                        </Box>
-                      )}
-                      <Box className={styles.gasPriceHelpBox}>
-                        <FormHelperText className={styles.gasPriceHelp}>
-                          {priorityGasPrice.toFixed(2)} {gasPriceUnit.toString()}
-                        </FormHelperText>
-                      </Box>
-                    </Box>
-                  </FormRow>
-                )}
-              </FormAccordion>
-              <FormRow>
-                <FormLabel />
-                <ButtonGroup classes={{ container: styles.buttons }}>
-                  {initializing && (
-                    <Button
-                      disabled
-                      icon={<CircularProgress size={16} />}
-                      label="Checking the network"
-                      variant="text"
-                    />
-                  )}
-                  <Button label="Cancel" onClick={goBack} />
-                  <Button primary disabled={initializing} label="Create Transaction" onClick={onCreateTransaction} />
-                </ButtonGroup>
-              </FormRow>
-            </>
-          )}
-        </>
-      )}
-      {stage === Stages.SIGN && (
-        <>
-          <FormRow>
-            <FormLabel />
-            <Typography>
-              Recover {formatAmount(tx.getAmount(), 6)} with fee {formatAmount(tx.getFees(), 6)}
-            </Typography>
-          </FormRow>
-          {isHardware ? (
-            <WaitLedger fullSize blockchain={transaction.blockchain} onConnected={() => onSignTransaction()} />
-          ) : (
-            <FormRow>
-              <FormLabel>Password</FormLabel>
-              <PasswordInput
-                error={passwordError}
-                minLength={1}
-                placeholder="Enter existing password"
-                showLengthNotice={false}
-                onChange={setPassword}
-                onPressEnter={onPasswordEnter}
-              />
-            </FormRow>
-          )}
-          <FormRow last>
-            <FormLabel />
-            <ButtonGroup classes={{ container: styles.buttons }}>
-              <Button label="Cancel" onClick={goBack} />
-              {!isHardware && (
-                <Button
-                  label="Sign Transaction"
-                  disabled={verifying || (password?.length ?? 0) === 0}
-                  primary={true}
-                  onClick={onSignTransaction}
-                />
-              )}
-            </ButtonGroup>
-          </FormRow>
-        </>
-      )}
-    </Page>
-  );
-};
-
-export default connect<StateProps, DispatchProps, OwnProps, IState>(
-  (state, { entry }) => {
-    const recoverBlockchainCode = blockchainIdToCode(entry.blockchain);
-    const recoverBlockchain = Blockchains[recoverBlockchainCode];
-
-    const wrongBlockchainCode = recoverBlockchainCode === BlockchainCode.ETC ? BlockchainCode.ETH : BlockchainCode.ETC;
-    const wrongBlockchain = Blockchains[wrongBlockchainCode];
-
-    const zeroAmount = accounts.selectors.zeroAmountFor(recoverBlockchainCode);
-    const balance = accounts.selectors.getBalance(state, entry.id, zeroAmount) ?? zeroAmount;
-
-    let entryTokenBalances: TokenAmount[] = [];
-
-    if (entry.address != null) {
-      entryTokenBalances = tokens.selectors.selectBalances(state, recoverBlockchainCode, entry.address?.value);
-    }
-
-    let isHardware = false;
-
-    const wallet = accounts.selectors.findWalletByEntryId(state, entry.id);
-
-    if (wallet != null) {
-      const [account] = wallet.reserved ?? [];
-
-      if (account != null) {
-        isHardware = accounts.selectors.isHardwareSeed(state, { type: 'id', value: account.seedId });
-      }
-    }
-
-    const balanceByToken = entryTokenBalances.reduce(
-      (carry, balance) => ({ ...carry, [balance.units.base.code]: balance }),
-      {
-        [recoverBlockchain.params.coinTicker]: balance,
-      },
-    );
-
-    const tokenRegistry = new TokenRegistry(state.application.tokens);
-
-    const tokenUnit = entryTokenBalances.filter((balance) => balance.isPositive()).map(({ units }) => units.base.code);
-    const tokenDataList = tokenRegistry
-      .byBlockchain(recoverBlockchainCode)
-      .filter(({ symbol }) => tokenUnit.includes(symbol));
-
-    const entries = wallet?.entries.filter((entry) => !entry.receiveDisabled) ?? [];
-
-    const addresses = Object.fromEntries(
-      entries.reduce<Map<string, string>>(
-        (carry, { address, blockchain }) =>
-          address != null && blockchain === entry.blockchain ? carry.set(address.value, address.value) : carry,
-        new Map(),
-      ),
-    );
-
-    return {
-      addresses,
-      balanceByToken,
-      isHardware,
-      recoverBlockchain,
-      wrongBlockchain,
-      eip1559: recoverBlockchain.params.eip1559 ?? false,
-      tokenDataList: [
-        ...tokenDataList,
-        {
-          address: '',
-          symbol: recoverBlockchain.params.coinTicker,
-          decimals: recoverBlockchain.params.decimals,
-        } as TokenData,
-      ],
-      getBalancesByAddress(address) {
-        const entryByAddress = accounts.selectors.findAccountByAddress(state, address, recoverBlockchainCode);
-
-        if (entryByAddress == null || !isEthereumEntry(entryByAddress)) {
-          return [];
-        }
-
-        const balance = accounts.selectors.getBalance(state, entryByAddress.id, zeroAmount) ?? zeroAmount;
-
-        return [formatAmount(balance)];
-      },
-    };
-  },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  (dispatch: any, { entry }) => ({
-    estimateGas(blockchain, tx) {
-      return dispatch(transaction.actions.estimateGas(blockchain, tx));
-    },
-    getFees(blockchain) {
-      return dispatch(transaction.actions.getFee(blockchain));
-    },
-    goBack() {
-      dispatch(screen.actions.goBack());
-    },
-    async signTransaction(tx, password) {
-      if (tx.from == null || tx.to == null) {
-        return;
-      }
-
-      const signed: SignData | undefined = await dispatch(
-        transaction.actions.signEthereumTransaction(entry.id, tx.build(), password),
-      );
-
-      if (signed != null) {
-        const gasPrice =
-          (tx.type === EthereumTransactionType.EIP1559 ? tx.maxGasPrice : tx.gasPrice) ??
-          amountFactory(tx.blockchain)(0);
-
-        dispatch(
-          screen.actions.gotoScreen(
-            screen.Pages.BROADCAST_TX,
-            {
-              ...signed,
-              fee: gasPrice.multiply(tx.gas),
-              originalAmount: tx.amount,
-            },
-            null,
-            true,
-          ),
-        );
-      }
-    },
-    verifyGlobalKey(password) {
-      return dispatch(accounts.actions.verifyGlobalKey(password));
-    },
-  }),
-)(CreateRecoverTransaction);
diff --git a/packages/react-app/src/transaction/CreateRecoverTransaction/index.ts b/packages/react-app/src/transaction/CreateRecoverTransaction/index.ts
deleted file mode 100644
index cfe8c38be..000000000
--- a/packages/react-app/src/transaction/CreateRecoverTransaction/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './CreateRecoverTransaction';
diff --git a/packages/react-app/src/transaction/CreateTransaction/CreateTransaction.tsx b/packages/react-app/src/transaction/CreateTransaction.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/CreateTransaction.tsx
rename to packages/react-app/src/transaction/CreateTransaction.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/SetupTransaction.tsx b/packages/react-app/src/transaction/SetupTransaction/SetupTransaction.tsx
similarity index 99%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/SetupTransaction.tsx
rename to packages/react-app/src/transaction/SetupTransaction/SetupTransaction.tsx
index 86840ccae..194e5fb0e 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/SetupTransaction.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/SetupTransaction.tsx
@@ -25,7 +25,7 @@ import {
 import { Box, CircularProgress, Grid, Typography } from '@material-ui/core';
 import * as React from 'react';
 import { connect } from 'react-redux';
-import { Asset } from '../../../common/SelectAsset';
+import { Asset } from '../../common/SelectAsset';
 import { Flow } from './flow';
 
 interface OwnProps {
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/cancel.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/cancel.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/cancel.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/cancel.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx
similarity index 95%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx
index c5107712c..99b069869 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/modify.tsx
@@ -1,7 +1,7 @@
 import { BitcoinEntry } from '@emeraldpay/emerald-vault-core';
 import { workflow } from '@emeraldwallet/core';
 import * as React from 'react';
-import { StoredTxView } from '../../../../../../../common/StoredTxView';
+import { StoredTxView } from '../../../../../../common/StoredTxView';
 import { ModifyFlow } from '../../../common';
 import { BitcoinFee } from '../../../components';
 import { Data, DataProvider, Handler } from '../../../types';
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/speedup.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/speedup.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/modify/speedup.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/modify/speedup.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/transfer.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/transfer.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/bitcoin/transfer.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/bitcoin/transfer.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx
similarity index 95%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx
index e4bea343b..0e56e2e34 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/approve.tsx
@@ -3,9 +3,9 @@ import { Blockchains, blockchainIdToCode, workflow } from '@emeraldwallet/core';
 import { CreateTxStage } from '@emeraldwallet/store';
 import { FormLabel, FormRow } from '@emeraldwallet/ui';
 import * as React from 'react';
-import { SelectAsset } from '../../../../../../../common/SelectAsset';
-import { SelectEntry } from '../../../../../../../common/SelectEntry';
-import { ToField } from '../../../../../../../common/ToField';
+import { SelectAsset } from '../../../../../../common/SelectAsset';
+import { SelectEntry } from '../../../../../../common/SelectEntry';
+import { ToField } from '../../../../../../common/ToField';
 import { Actions, ApproveAmount, EthereumFee } from '../../../components';
 import { CommonFlow, Data, DataProvider, Handler } from '../../../types';
 
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx
similarity index 98%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx
index a42015683..b6c081ab8 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/convert.tsx
@@ -4,7 +4,7 @@ import { CreateTxStage } from '@emeraldwallet/store';
 import { FormLabel, FormRow } from '@emeraldwallet/ui';
 import { ToggleButton, ToggleButtonGroup } from '@material-ui/lab';
 import * as React from 'react';
-import { SelectEntry } from '../../../../../../../common/SelectEntry';
+import { SelectEntry } from '../../../../../../common/SelectEntry';
 import { Actions, Amount, EthereumFee } from '../../../components';
 import { CommonFlow, Data, DataProvider, Handler } from '../../../types';
 
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/erc20/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/erc20/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/cancel.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/cancel.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/cancel.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/cancel.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx
similarity index 95%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx
index dfad30e47..94e7f97c0 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/modify.tsx
@@ -1,7 +1,7 @@
 import { EthereumEntry } from '@emeraldpay/emerald-vault-core';
 import { workflow } from '@emeraldwallet/core';
 import * as React from 'react';
-import { StoredTxView } from '../../../../../../../common/StoredTxView';
+import { StoredTxView } from '../../../../../../common/StoredTxView';
 import { ModifyFlow } from '../../../common';
 import { EthereumFee } from '../../../components';
 import { Data, DataProvider, Handler } from '../../../types';
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/speedup.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/speedup.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/modify/speedup.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/modify/speedup.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx
similarity index 96%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx
index f9f6b1eaf..991d15014 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/ethereum/transfer.tsx
@@ -2,7 +2,7 @@ import { EthereumEntry } from '@emeraldpay/emerald-vault-core';
 import { workflow } from '@emeraldwallet/core';
 import { FormLabel, FormRow } from '@emeraldwallet/ui';
 import * as React from 'react';
-import { SelectAsset } from '../../../../../../common/SelectAsset';
+import { SelectAsset } from '../../../../../common/SelectAsset';
 import { TransferFlow } from '../../common';
 import { EthereumFee } from '../../components';
 import { Data, DataProvider, Handler } from '../../types';
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/blockchain/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/blockchain/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/blockchain/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/common/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/common/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/modify.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/common/modify.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/modify.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/common/modify.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/transfer.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/common/transfer.tsx
similarity index 97%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/transfer.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/common/transfer.tsx
index 289028668..dd832c924 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/common/transfer.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/common/transfer.tsx
@@ -3,7 +3,7 @@ import { workflow } from '@emeraldwallet/core';
 import { CreateTxStage } from '@emeraldwallet/store';
 import { FormLabel, FormRow } from '@emeraldwallet/ui';
 import * as React from 'react';
-import { SelectEntry } from '../../../../../common/SelectEntry';
+import { SelectEntry } from '../../../../common/SelectEntry';
 import { Actions, Amount, To } from '../components';
 import { CommonFlow, Data, DataProvider, Handler } from '../types';
 
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/Actions.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/Actions.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/Actions.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/Actions.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/Amount.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/Amount.tsx
similarity index 81%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/Amount.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/Amount.tsx
index daf4eab56..4d1351606 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/Amount.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/components/Amount.tsx
@@ -1,8 +1,8 @@
-import { Blockchains, workflow } from '@emeraldwallet/core';
+import { Blockchains, TokenAmount, workflow } from '@emeraldwallet/core';
 import { Button, FormLabel, FormRow } from '@emeraldwallet/ui';
 import BigNumber from 'bignumber.js';
 import * as React from 'react';
-import { NumberField } from '../../../../../common/NumberField';
+import { NumberField } from '../../../../common/NumberField';
 
 interface OwnProps {
   createTx: workflow.AnyCreateTx;
@@ -29,7 +29,13 @@ export const Amount: React.FC<OwnProps> = ({ createTx, maxDisabled, setTransacti
     setMaxAmount(createTx.amount.getNumberByUnit(createTx.amount.units.top));
   };
 
-  const { decimals } = Blockchains[createTx.blockchain].params;
+  let decimals: number;
+
+  if (TokenAmount.is(createTx.amount)) {
+    ({ decimals } = createTx.amount.token);
+  } else {
+    ({ decimals } = Blockchains[createTx.blockchain].params);
+  }
 
   return (
     <FormRow>
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/ApproveAmount.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/ApproveAmount.tsx
similarity index 67%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/ApproveAmount.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/ApproveAmount.tsx
index 72731fbeb..956e29119 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/ApproveAmount.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/components/ApproveAmount.tsx
@@ -1,11 +1,11 @@
-import { BigAmount } from '@emeraldpay/bigamount';
-import { TokenAmount, workflow } from '@emeraldwallet/core';
-import { FormLabel, FormRow } from '@emeraldwallet/ui';
+import { workflow } from '@emeraldwallet/core';
+import { Button, FormLabel, FormRow } from '@emeraldwallet/ui';
 import { IconButton, Tooltip, createStyles, makeStyles } from '@material-ui/core';
 import { AllInclusive as InfiniteIcon } from '@material-ui/icons';
 import { Alert } from '@material-ui/lab';
+import BigNumber from 'bignumber.js';
 import * as React from 'react';
-import { AmountField } from '../../../../../common/AmountField';
+import { NumberField } from '../../../../common/NumberField';
 
 const useStyles = makeStyles((theme) =>
   createStyles({
@@ -29,6 +29,7 @@ export const ApproveAmount: React.FC<OwnProps> = ({ createTx, setTransaction })
   const styles = useStyles();
 
   const [allowInfinite, setAllowInfinite] = React.useState(createTx.target === workflow.ApproveTarget.INFINITE);
+  const [maxAmount, setMaxAmount] = React.useState<BigNumber | undefined>();
 
   const handleInfiniteClick = (): void => {
     const allowed = !allowInfinite;
@@ -40,18 +41,18 @@ export const ApproveAmount: React.FC<OwnProps> = ({ createTx, setTransaction })
     setTransaction(createTx.dump());
   };
 
-  const handleAmountChange = (amount: BigAmount): void => {
-    createTx.amount = new TokenAmount(amount, createTx.amount.units, createTx.token);
+  const handleAmountChange = (amount: BigNumber): void => {
+    createTx.amount = amount;
 
     setTransaction(createTx.dump());
   };
 
-  const handleMaxAmountClick = (callback: (value: BigAmount) => void): void => {
+  const handleMaxAmountClick = (): void => {
     createTx.target = workflow.ApproveTarget.MAX_AVAILABLE;
 
-    callback(createTx.amount);
-
     setTransaction(createTx.dump());
+
+    setMaxAmount(createTx.amount.getNumberByUnit(createTx.amount.units.top));
   };
 
   return (
@@ -69,13 +70,20 @@ export const ApproveAmount: React.FC<OwnProps> = ({ createTx, setTransaction })
             </IconButton>
           </Tooltip>
           {!allowInfinite && (
-            <AmountField
-              amount={createTx.amount}
-              fieldWidth={380}
-              maxAmount={createTx.totalTokenBalance}
-              units={createTx.totalTokenBalance.units}
-              onChangeAmount={handleAmountChange}
-              onMaxClick={handleMaxAmountClick}
+            <NumberField
+              decimals={createTx.token.decimals}
+              initialValue={createTx.amount.getNumberByUnit(createTx.amount.units.top)}
+              rightIcon={
+                <Button
+                  label="Max"
+                  primary={createTx.target === workflow.ApproveTarget.MAX_AVAILABLE}
+                  size="small"
+                  variant="text"
+                  onClick={handleMaxAmountClick}
+                />
+              }
+              value={maxAmount}
+              onChange={handleAmountChange}
             />
           )}
         </div>
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/BitcoinFee.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/BitcoinFee.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/BitcoinFee.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/BitcoinFee.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/EthereumFee.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/EthereumFee.tsx
similarity index 97%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/EthereumFee.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/EthereumFee.tsx
index ca3359a87..23e5748e3 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/EthereumFee.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/components/EthereumFee.tsx
@@ -2,7 +2,7 @@ import { CreateAmount } from '@emeraldpay/bigamount';
 import { WeiAny } from '@emeraldpay/bigamount-crypto';
 import { Blockchains, EthereumTransactionType, amountFactory, workflow } from '@emeraldwallet/core';
 import * as React from 'react';
-import { EthTxSettings } from '../../../../../common/EthTxSettings';
+import { EthTxSettings } from '../../../../common/EthTxSettings';
 
 interface OwnProps {
   createTx: workflow.AnyEthereumCreateTx;
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/To.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/components/To.tsx
similarity index 92%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/To.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/To.tsx
index 62fecfa38..cbf7005c0 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/To.tsx
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/components/To.tsx
@@ -1,7 +1,7 @@
 import { workflow } from '@emeraldwallet/core';
 import { FormLabel, FormRow } from '@emeraldwallet/ui';
 import * as React from 'react';
-import { ToField } from '../../../../../common/ToField';
+import { ToField } from '../../../../common/ToField';
 
 interface OwnProps {
   createTx: workflow.AnyBitcoinCreateTx | workflow.AnyEtherCreateTx | workflow.AnyErc20CreateTx;
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/components/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/components/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/components/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/flow.tsx b/packages/react-app/src/transaction/SetupTransaction/flow/flow.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/flow.tsx
rename to packages/react-app/src/transaction/SetupTransaction/flow/flow.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/index.ts b/packages/react-app/src/transaction/SetupTransaction/flow/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/types.ts b/packages/react-app/src/transaction/SetupTransaction/flow/types.ts
similarity index 96%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/types.ts
rename to packages/react-app/src/transaction/SetupTransaction/flow/types.ts
index 22b5092f5..828dfd120 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/flow/types.ts
+++ b/packages/react-app/src/transaction/SetupTransaction/flow/types.ts
@@ -3,7 +3,7 @@ import { WalletEntry } from '@emeraldpay/emerald-vault-core';
 import { CurrencyAmount, TokenRegistry, workflow } from '@emeraldwallet/core';
 import { Allowance, CreateTxStage, FeeState, StoredTransaction } from '@emeraldwallet/store';
 import * as React from 'react';
-import { Asset } from '../../../../common/SelectAsset';
+import { Asset } from '../../../common/SelectAsset';
 import {
   BitcoinCancelFlow,
   BitcoinSpeedUpFlow,
diff --git a/packages/react-app/src/transaction/CreateTransaction/SetupTransaction/index.ts b/packages/react-app/src/transaction/SetupTransaction/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SetupTransaction/index.ts
rename to packages/react-app/src/transaction/SetupTransaction/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/SignTransaction.tsx b/packages/react-app/src/transaction/SignTransaction/SignTransaction.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/SignTransaction.tsx
rename to packages/react-app/src/transaction/SignTransaction/SignTransaction.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/bitcoin.tsx b/packages/react-app/src/transaction/SignTransaction/display/blockchain/bitcoin.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/bitcoin.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/bitcoin.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/approve.tsx b/packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/approve.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/approve.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/approve.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/convert.tsx b/packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/convert.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/convert.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/convert.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/index.ts b/packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/erc20/index.ts
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/erc20/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/ethereum.tsx b/packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/ethereum.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/ethereum.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/ethereum.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/index.ts b/packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/ethereum/index.ts
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/ethereum/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/index.ts b/packages/react-app/src/transaction/SignTransaction/display/blockchain/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/blockchain/index.ts
rename to packages/react-app/src/transaction/SignTransaction/display/blockchain/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/common.tsx b/packages/react-app/src/transaction/SignTransaction/display/common.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/common.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/common.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/Actions.tsx b/packages/react-app/src/transaction/SignTransaction/display/components/Actions.tsx
similarity index 98%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/Actions.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/components/Actions.tsx
index 6a0e66877..d51a863d6 100644
--- a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/Actions.tsx
+++ b/packages/react-app/src/transaction/SignTransaction/display/components/Actions.tsx
@@ -2,7 +2,7 @@ import { BlockchainCode } from '@emeraldwallet/core';
 import { Button, ButtonGroup, FormLabel, FormRow, PasswordInput } from '@emeraldwallet/ui';
 import { Box, CircularProgress, Grid, Typography, createStyles, makeStyles } from '@material-ui/core';
 import * as React from 'react';
-import WaitLedger from '../../../../../ledger/WaitLedger';
+import WaitLedger from '../../../../ledger/WaitLedger';
 
 const useStyles = makeStyles(() =>
   createStyles({
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/AddressPreview.tsx b/packages/react-app/src/transaction/SignTransaction/display/components/AddressPreview.tsx
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/AddressPreview.tsx
rename to packages/react-app/src/transaction/SignTransaction/display/components/AddressPreview.tsx
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/index.ts b/packages/react-app/src/transaction/SignTransaction/display/components/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/components/index.ts
rename to packages/react-app/src/transaction/SignTransaction/display/components/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/display.ts b/packages/react-app/src/transaction/SignTransaction/display/display.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/display.ts
rename to packages/react-app/src/transaction/SignTransaction/display/display.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/index.ts b/packages/react-app/src/transaction/SignTransaction/display/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/index.ts
rename to packages/react-app/src/transaction/SignTransaction/display/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/types.ts b/packages/react-app/src/transaction/SignTransaction/display/types.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/display/types.ts
rename to packages/react-app/src/transaction/SignTransaction/display/types.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/SignTransaction/index.ts b/packages/react-app/src/transaction/SignTransaction/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/SignTransaction/index.ts
rename to packages/react-app/src/transaction/SignTransaction/index.ts
diff --git a/packages/react-app/src/transaction/CreateTransaction/index.ts b/packages/react-app/src/transaction/index.ts
similarity index 100%
rename from packages/react-app/src/transaction/CreateTransaction/index.ts
rename to packages/react-app/src/transaction/index.ts
diff --git a/packages/react-app/src/wallets/WalletDetails/entry/EthereumEntryItem.tsx b/packages/react-app/src/wallets/WalletDetails/entry/EthereumEntryItem.tsx
index cdd4c583a..66da4041d 100644
--- a/packages/react-app/src/wallets/WalletDetails/entry/EthereumEntryItem.tsx
+++ b/packages/react-app/src/wallets/WalletDetails/entry/EthereumEntryItem.tsx
@@ -272,7 +272,18 @@ export default connect<StateProps, DispatchProps, OwnProps, IState>(
       );
     },
     gotoRecover() {
-      dispatch(screen.actions.gotoScreen(screen.Pages.CREATE_TX_RECOVER, entry, null, true));
+      dispatch(
+        screen.actions.gotoScreen(
+          screen.Pages.CREATE_TX,
+          {
+            walletId,
+            action: TxAction.RECOVERY,
+            entryId: entry.id,
+          },
+          null,
+          true,
+        ),
+      );
     },
     gotoSend(asset) {
       dispatch(
diff --git a/packages/store/src/screen/types.ts b/packages/store/src/screen/types.ts
index 123edefad..5477b6bf2 100644
--- a/packages/store/src/screen/types.ts
+++ b/packages/store/src/screen/types.ts
@@ -24,9 +24,7 @@ export enum Pages {
   ADD_ADDRESS = 'add-address',
   ADD_HD_ADDRESS = 'add-hd-address',
   ADDRESS_BOOK = 'address-book',
-  BROADCAST_TX = 'broadcast-tx',
   CREATE_TX = 'create-tx',
-  CREATE_TX_RECOVER = 'create-tx-recovery',
   CREATE_WALLET = 'create-wallet',
   EDIT_ADDRESS = 'edit-address',
   GLOBAL_KEY = 'global-key',