feat: updated branch after stake method merge

MetaMask · Oct 22, 2024 · f8edfa2 · f8edfa2
1 parent 487368b
commit f8edfa2
Show file tree

Hide file tree

Showing 59 changed files with 51 additions and 4,595 deletions.
diff --git a/app/components/UI/Stake/Views/InputView/StakeInputView.tsx b/app/components/UI/Stake/Views/InputView/StakeInputView.tsx
diff --git a/app/components/UI/Stake/Views/StakeConfirmationView/StakeConfirmationView.test.tsx b/app/components/UI/Stake/Views/StakeConfirmationView/StakeConfirmationView.test.tsx
@@ -56,8 +56,6 @@ jest.mock('@react-navigation/native', () => {
 jest.mock('../../hooks/usePoolStakedDeposit', () => ({
  __esModule: true,
  default: () => ({
- poolStakingContract: {},
- estimateDepositGas: jest.fn(),
  attemptDepositTransaction: jest.fn(),
  }),
 }));

diff --git a/app/components/UI/Stake/Views/UnstakeConfirmationView/UnstakeConfirmationView.test.tsx b/app/components/UI/Stake/Views/UnstakeConfirmationView/UnstakeConfirmationView.test.tsx
@@ -56,6 +56,13 @@ jest.mock('@react-navigation/native', () => {
  };
 });
 
+jest.mock('../../hooks/usePoolStakedDeposit', () => ({
+ __esModule: true,
+ default: () => ({
+ attemptDepositTransaction: jest.fn(),
+ }),
+}));
+
 describe('UnstakeConfirmationView', () => {
  it('render matches snapshot', () => {
  const props: UnstakeConfirmationViewProps = {

diff --git a/app/components/UI/Stake/Views/UnstakeConfirmationView/UnstakeConfirmationView.tsx b/app/components/UI/Stake/Views/UnstakeConfirmationView/UnstakeConfirmationView.tsx
@@ -4,13 +4,14 @@ import { useNavigation } from '@react-navigation/native';
 import styleSheet from './UnstakeConfirmationView.styles';
 import { useStyles } from '../../../../hooks/useStyles';
 import { getStakingNavbar } from '../../../Navbar';
-import AccountHeaderCard from '../../components/Confirmation/AccountHeaderCard/AccountHeaderCard';
 import { strings } from '../../../../../../locales/i18n';
-import ConfirmationFooter from '../../components/Confirmation/ConfirmationFooter/ConfirmationFooter';
-import YouReceiveCard from '../../components/Confirmation/YouReceiveCard/YouReceiveCard';
-import UnstakingTimeCard from '../../components/Confirmation/UnstakeTimeCard/UnstakeTimeCard';
+import YouReceiveCard from '../../components/StakingConfirmation/YouReceiveCard/YouReceiveCard';
+import UnstakingTimeCard from '../../components/StakingConfirmation/UnstakeTimeCard/UnstakeTimeCard';
 import { UnstakeConfirmationViewProps } from './UnstakeConfirmationView.types';
 import TokenValueStack from '../../components/StakingConfirmation/TokenValueStack/TokenValueStack';
+import AccountHeaderCard from '../../components/StakingConfirmation/AccountHeaderCard/AccountHeaderCard';
+import ConfirmationFooter from '../../components/StakingConfirmation/ConfirmationFooter/ConfirmationFooter';
+import { FooterButtonGroupActions } from '../../components/StakingConfirmation/ConfirmationFooter/FooterButtonGroup/FooterButtonGroup.types';
 
 const MOCK_STAKING_CONTRACT_NAME = 'MM Pooled Staking';
 
@@ -49,7 +50,10 @@ const UnstakeConfirmationView = ({ route }: UnstakeConfirmationViewProps) => {
  <UnstakingTimeCard />
  </View>
  </View>
- <ConfirmationFooter />
+ <ConfirmationFooter
+ valueWei={route.params.amountWei}
+ action={FooterButtonGroupActions.UNSTAKE}
+ />
  </View>
  );
 };

diff --git a/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.tsx b/app/components/UI/Stake/Views/UnstakeInputView/UnstakeInputView.tsx
@@ -33,6 +33,7 @@ const UnstakeInputView = () => {
  currentCurrency,
  isNonZeroAmount,
  amountEth,
+ amountWei,
  fiatAmount,
  isOverMaximum,
  handleCurrencySwitch,
@@ -65,15 +66,15 @@ const UnstakeInputView = () => {
  );
  }, [navigation, theme.colors, title]);
 
-  const handleUnstakePress = useCallback(() => {
-  navigation.navigate('StakeScreens', {
-  screen: Routes.STAKING.UNSTAKE_CONFIRMATION,
-  params: {
-  amountWei: amountWei.toString(),
-  amountFiat: fiatAmount,
-  },
-  });
-  }, [amountWei, fiatAmount, navigation]);
+ const handleUnstakePress = useCallback(() => {
+ navigation.navigate('StakeScreens', {
+ screen: Routes.STAKING.UNSTAKE_CONFIRMATION,
+ params: {
+ amountWei: amountWei.toString(),
+ amountFiat: fiatAmount,
+ },
+ });
+ }, [amountWei, fiatAmount, navigation]);
 
  return (
  <ScreenLayout style={styles.container}>

diff --git a/...components/UI/Stake/components/Confirmation/AccountHeaderCard/AccountHeaderCard.styles.ts b/...components/UI/Stake/components/Confirmation/AccountHeaderCard/AccountHeaderCard.styles.ts