Merge pull request #1353 from emeraldpay/feature/reorganize-components

solution: reorganize components
emeraldpay · Dec 19, 2023 · cef96fb · cef96fb
2 parents 2064105 + f397b66
commit cef96fb
Show file tree

Hide file tree

Showing 80 changed files with 64 additions and 1,398 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/packages/react-app/src/common/AmountField/AmountField.tsx b/packages/react-app/src/common/AmountField/AmountField.tsx
diff --git a/packages/react-app/src/common/AmountField/index.ts b/packages/react-app/src/common/AmountField/index.ts
diff --git a/packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx b/packages/react-app/src/common/BtcConfirm/BtcConfirm.tsx
diff --git a/packages/react-app/src/common/BtcConfirm/RawTx.tsx b/packages/react-app/src/common/BtcConfirm/RawTx.tsx