fixup! feat(suite): add staking/unstaking instant amount forecasting

everstake · Oct 21, 2024 · 9e1a100 · 9e1a100
1 parent a854667
commit 9e1a100
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/...s/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx b/...s/suite/modals/ReduxModal/UserContextModal/UnstakeModal/UnstakeEthForm/UnstakeEthForm.tsx
@@ -11,7 +11,7 @@ import { getUnstakingPeriodInDays } from 'src/utils/suite/stake';
 import UnstakeFees from './Fees';
 import { selectValidatorsQueueData } from '@suite-common/wallet-core';
 import { getAccountEverstakeStakingPool } from '@suite-common/wallet-utils';
-import { ApproximateEthAmount } from 'src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateEthAmount';
+import { ApproximateInstantEthAmount } from 'src/views/wallet/staking/components/EthStakingDashboard/components/ApproximateInstantEthAmount';
 import { BigNumber } from '@trezor/utils';
 
 const DividerWrapper = styled.div`
@@ -124,7 +124,7 @@ export const UnstakeEthForm = () => {
                                 </Tooltip>
                             </Row>
 
-                            <ApproximateEthAmount
+                            <ApproximateInstantEthAmount
                                 value={approximatedInstantEthAmount}
                                 symbol={symbol.toUpperCase()}
                             />

diff --git a/packages/suite/src/utils/suite/__fixtures__/stake.ts b/packages/suite/src/utils/suite/__fixtures__/stake.ts
@@ -872,7 +872,7 @@ export const simulateUnstakeFixture = [
             from: undefined,
             symbol: undefined,
         },
-        ethereumCallResult: {},
+        blockchainEvmRpcCallResult: {},
         result: null,
     },
     {
@@ -883,7 +883,7 @@ export const simulateUnstakeFixture = [
             to: '0xAFA848357154a6a624686b348303EF9a13F63264',
             symbol: 'eth',
         },
-        ethereumCallResult: {
+        blockchainEvmRpcCallResult: {
             success: true,
             payload: { data: '0x000000000000000000000000000000000000000000000000016345785d8a0000' },
         },

diff --git a/packages/suite/src/utils/suite/__tests__/stake.test.ts b/packages/suite/src/utils/suite/__tests__/stake.test.ts
@@ -269,14 +269,14 @@ describe('getChangedInternalTx', () => {
     });
 });
 
-type EthereumCallResult = Unsuccessful | SuccessWithDevice<{ data: string }>;
+type BlockchainEvmRpcCallResult = Unsuccessful | SuccessWithDevice<{ data: string }>;
 type SimulateUnstakeArgs = StakeTxBaseArgs & { amount: string };
 
 describe('simulateUnstake', () => {
     simulateUnstakeFixture.forEach(test => {
         it(test.description, async () => {
-            jest.spyOn(TrezorConnect, 'ethereumCall').mockImplementation(() =>
-                Promise.resolve(test.ethereumCallResult as EthereumCallResult),
+            jest.spyOn(TrezorConnect, 'blockchainEvmRpcCall').mockImplementation(() =>
+                Promise.resolve(test.blockchainEvmRpcCallResult as BlockchainEvmRpcCallResult),
             );
             const result = await simulateUnstake(test.args as SimulateUnstakeArgs);
             expect(result).toEqual(test.result);

diff --git a/packages/suite/src/utils/suite/stake.ts b/packages/suite/src/utils/suite/stake.ts
@@ -653,15 +653,14 @@ export const simulateUnstake = async ({
 
     const amountWei = toWei(amount, 'ether');
     const interchanges = 0;
-    const coin = symbol?.toString();
 
     const data = contractPool.methods
         .unstake(amountWei, interchanges, WALLET_SDK_SOURCE)
         .encodeABI();
     if (!data) return null;
 
-    const ethereumData = await TrezorConnect.ethereumCall({
-        coin,
+    const ethereumData = await TrezorConnect.blockchainEvmRpcCall({
+        coin: symbol,
         from,
         to: poolAddress,
         data,

diff --git a/...board/components/ApproximateEthAmount.tsx → ...omponents/ApproximateInstantEthAmount.tsx b/...board/components/ApproximateEthAmount.tsx → ...omponents/ApproximateInstantEthAmount.tsx
@@ -2,14 +2,17 @@ import { FormattedCryptoAmount } from 'src/components/suite';
 import { Tooltip } from '@trezor/components';
 import { BigNumber } from '@trezor/utils/src/bigNumber';
 
-interface ApproximateEthAmountProps {
+interface ApproximateInstantEthAmountProps {
     value: string | number;
     symbol: string;
 }
 
 const DEFAULT_MAX_DECIMAL_PLACES = 2;
 
-export const ApproximateEthAmount = ({ value, symbol }: ApproximateEthAmountProps) => {
+export const ApproximateInstantEthAmount = ({
+    value,
+    symbol,
+}: ApproximateInstantEthAmountProps) => {
     const hasDecimals = value.toString().includes('.');
 
     if (!hasDecimals) {