Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions app/components/Nav/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
import useInterval from '../../hooks/useInterval';
import { Duration } from '@metamask/utils';
import { selectSeedlessOnboardingLoginFlow } from '../../../selectors/seedlessOnboardingController';
import { SmartAccountUpdateModal } from '../../Views/confirmations/components/smart-account-update-modal';
import { PayWithModal } from '../../Views/confirmations/components/modals/pay-with-modal/pay-with-modal';
import { State2AccountConnectWrapper } from '../../Views/MultichainAccounts/MultichainAccountConnect/State2AccountConnectWrapper';
import { SmartAccountModal } from '../../Views/MultichainAccounts/AccountDetails/components/SmartAccountModal/SmartAccountModal';
Expand Down Expand Up @@ -889,21 +888,6 @@
</Stack.Navigator>
);

const ModalSmartAccountOptIn = () => (
<Stack.Navigator
screenOptions={{
headerShown: false,
cardStyle: { backgroundColor: importedColors.transparent },
}}
mode={'modal'}
>
<Stack.Screen
name={Routes.SMART_ACCOUNT_OPT_IN}
component={SmartAccountUpdateModal}
/>
</Stack.Navigator>
);

const AppFlow = () => (
<Stack.Navigator
initialRouteName={Routes.FOX_LOADER}
Expand Down Expand Up @@ -1088,10 +1072,6 @@
name={Routes.CONFIRMATION_SWITCH_ACCOUNT_TYPE}
component={ModalSwitchAccountType}
/>
<Stack.Screen
name={Routes.SMART_ACCOUNT_OPT_IN}
component={ModalSmartAccountOptIn}
/>
<Stack.Screen
name={Routes.CONFIRMATION_PAY_WITH_MODAL}
component={PayWithModal}
Expand Down Expand Up @@ -1174,7 +1154,7 @@
Logger.error(error, 'Error starting app');
});
// existingUser is not present in the dependency array because it is not needed to re-run the effect when it changes and it will cause a bug.
// eslint-disable-next-line react-hooks/exhaustive-deps

Check warning on line 1157 in app/components/Nav/App/App.tsx

View workflow job for this annotation

GitHub Actions / scripts (lint)

React Compiler has skipped optimizing this component because one or more React ESLint rules were disabled. React Compiler only works when your components follow all the rules of React, disabling them may result in unexpected or incorrect behavior
}, []);

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import { act } from '@testing-library/react-native';
import React from 'react';
import { cloneDeep } from 'lodash';
import { ScrollView } from 'react-native';
import { SafeAreaProvider } from 'react-native-safe-area-context';
import {
generateContractInteractionState,
getAppStateForConfirmation,
personalSignatureConfirmationState,
stakingClaimConfirmationState,
stakingDepositConfirmationState,
stakingWithdrawalConfirmationState,
typedSignV1ConfirmationState,
upgradeAccountConfirmation,
} from '../../../../../util/test/confirm-data-helpers';
import renderWithProvider from '../../../../../util/test/renderWithProvider';
import { Confirm, ConfirmationLoader } from './confirm-component';
Expand Down Expand Up @@ -301,20 +298,6 @@ describe('Confirm', () => {
expect(getByText('Network fee')).toBeDefined();
});

it('renders splash page if present', async () => {
const { getByText } = renderWithProvider(<Confirm />, {
state: getAppStateForConfirmation(upgradeAccountConfirmation, {
PreferencesController: { smartAccountOptIn: false },
}),
});

await act(async () => {
await Promise.resolve();
});

expect(getByText('Use smart account?')).toBeTruthy();
});

it('displays loading spinner when no approval request exists', () => {
const stateWithoutRequest = cloneDeep(typedSignV1ConfirmationState);
stateWithoutRequest.engine.backgroundState.ApprovalController = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import AlertBanner from '../alert-banner';
import Info from '../info-root';
import Title from '../title';
import { Footer, FooterSkeleton } from '../footer';
import { Splash } from '../splash';
import styleSheet from './confirm-component.styles';
import { TransactionType } from '@metamask/transaction-controller';
import { useParams } from '../../../../../util/navigation/navUtils';
Expand Down Expand Up @@ -91,7 +90,6 @@ const ConfirmWrapped = ({
</TouchableWithoutFeedback>
</ScrollView>
<Footer />
<Splash />
</LedgerContextProvider>
</QRHardwareContextProvider>
</ConfirmationAlerts>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading