Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
76e61c6
feat: introduce Accounts Menu screen foundation
vinnyhoward Feb 3, 2026
62a3703
feat: base account menu screen
vinnyhoward Feb 4, 2026
3256d99
Merge branch 'main' into feat-tmcu-397-account-menu
vinnyhoward Feb 4, 2026
7098d71
fix: fixing navigation issues and adding tracking
vinnyhoward Feb 4, 2026
0c96efc
Merge branch 'feat-tmcu-397-account-menu' of github.com:MetaMask/meta…
vinnyhoward Feb 4, 2026
cf91431
Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…
vinnyhoward Feb 4, 2026
73c5725
refactor: refined new account menu screen, refined/updated unit tests…
vinnyhoward Feb 5, 2026
2df5af0
perf: improved account menu screen performance via memoization
vinnyhoward Feb 5, 2026
c378bd2
Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…
vinnyhoward Feb 5, 2026
03ca083
fix: fix header import because of recent header refactor
vinnyhoward Feb 5, 2026
6fb96ec
fix: various bug fixes
vinnyhoward Feb 5, 2026
9553d60
fix: varius small UI updates
vinnyhoward Feb 5, 2026
40e94d4
Update app/components/Views/AccountsMenu/AccountsMenu.tsx
vinnyhoward Feb 6, 2026
3c3fe34
Update app/components/Views/AccountsMenu/AccountsMenu.tsx
vinnyhoward Feb 6, 2026
9eb6f8f
Update app/components/Views/AccountsMenu/AccountsMenu.tsx
vinnyhoward Feb 6, 2026
275daf9
Merge branch 'main' into feat-tmcu-397-account-menu
vinnyhoward Feb 6, 2026
8cd242b
fix: update copy
vinnyhoward Feb 6, 2026
52567cb
fix: update copy
vinnyhoward Feb 6, 2026
4feff18
fix: re-add card into header
vinnyhoward Feb 6, 2026
0db076e
fix: unit test and metametrics events
vinnyhoward Feb 6, 2026
84ae1c3
fix: udpate mocks
vinnyhoward Feb 6, 2026
54e82c9
fix: re-add conditional logic
vinnyhoward Feb 6, 2026
b806eaf
Merge branch 'main' into feat-tmcu-397-account-menu
vinnyhoward Feb 6, 2026
7b2c97d
fix: updated E2E test and created POM for Account Menu
vinnyhoward Feb 6, 2026
de15b06
fix: more E2E fixes and copy udpate
vinnyhoward Feb 6, 2026
a525ce5
fix: fixed more E2E tests
vinnyhoward Feb 6, 2026
2f4c998
fix: more E2E fixes related to settings
vinnyhoward Feb 9, 2026
75e6314
Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…
vinnyhoward Feb 9, 2026
4004268
fix: snaps
vinnyhoward Feb 9, 2026
a09ed41
fix: more E2E fixes
vinnyhoward Feb 9, 2026
f067a65
Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…
vinnyhoward Feb 10, 2026
63bc579
fix: remove unused test id
vinnyhoward Feb 11, 2026
74e8759
Merge branch 'main' of github.com:MetaMask/metamask-mobile into feat-…
vinnyhoward Feb 11, 2026
cc6905d
fix: remove comment and updated snaps due to DS package update
vinnyhoward Feb 11, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ describe('TabBar', () => {

fireEvent.press(getByTestId(`tab-bar-item-${TabBarIconKey.Setting}`));
expect(navigation.navigate).toHaveBeenCalledWith(Routes.SETTINGS_VIEW, {
screen: 'Settings',
screen: Routes.ACCOUNTS_MENU_VIEW,
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
break;
case Routes.SETTINGS_VIEW:
navigation.navigate(Routes.SETTINGS_VIEW, {
screen: 'Settings',
screen: Routes.ACCOUNTS_MENU_VIEW,
});
break;
case Routes.TRENDING_VIEW:
Expand Down
8 changes: 7 additions & 1 deletion app/components/Nav/Main/MainNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Browser from '../../Views/Browser';
import { ChainId } from '@metamask/controller-utils';
import AddBookmark from '../../Views/AddBookmark';
import SimpleWebview from '../../Views/SimpleWebview';
import AccountsMenu from '../../Views/AccountsMenu';
import Settings from '../../Views/Settings';
import GeneralSettings from '../../Views/Settings/GeneralSettings';
import AdvancedSettings from '../../Views/Settings/AdvancedSettings';
Expand Down Expand Up @@ -359,7 +360,12 @@ const NotificationsOptInStack = () => (
);

const SettingsFlow = () => (
<Stack.Navigator initialRouteName={'Settings'}>
<Stack.Navigator initialRouteName={Routes.ACCOUNTS_MENU_VIEW}>
<Stack.Screen
name={Routes.ACCOUNTS_MENU_VIEW}
component={AccountsMenu}
options={{ headerShown: false }}
/>
<Stack.Screen
name="Settings"
component={Settings}
Expand Down
17 changes: 0 additions & 17 deletions app/components/UI/Navbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,6 @@ export function getOfflineModalNavbar() {
* @param {boolean | null} isBackupAndSyncEnabled - Whether backup and sync is enabled
* @param {number} unreadNotificationCount - The number of unread notifications
* @param {number} readNotificationCount - The number of read notifications
* @param {boolean} shouldDisplayCardButton - Whether to display the card button
* @returns {Object} An object containing the navbar options for the wallet screen
*/
export function getWalletNavbarOptions(
Expand All @@ -836,7 +835,6 @@ export function getWalletNavbarOptions(
isBackupAndSyncEnabled,
unreadNotificationCount,
readNotificationCount,
shouldDisplayCardButton,
) {
const innerStyles = StyleSheet.create({
headerContainer: {
Expand Down Expand Up @@ -973,15 +971,6 @@ export function getWalletNavbarOptions(
navigation.navigate(Routes.SETTINGS_VIEW);
};

const handleCardPress = () => {
trackEvent(
MetricsEventBuilder.createEventBuilder(
MetaMetricsEvents.CARD_HOME_CLICKED,
).build(),
);
navigation.navigate(Routes.CARD.ROOT);
};

return {
header: () => (
<HeaderBase
Expand All @@ -997,12 +986,6 @@ export function getWalletNavbarOptions(
>
<AddressCopy hitSlop={innerStyles.touchAreaSlop} />
</View>
{shouldDisplayCardButton && (
<CardButton
onPress={handleCardPress}
touchAreaSlop={innerStyles.touchAreaSlop}
/>
)}
<ButtonIcon
iconProps={{ color: MMDSIconColor.Default }}
onPress={openQRScanner}
Expand Down
1 change: 1 addition & 0 deletions app/components/UI/Stake/constants/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ export const EVENT_LOCATIONS = {
UNSTAKE_CONFIRMATION_VIEW: 'UnstakeConfirmationView',
WALLET_ACTIONS_BOTTOM_SHEET: 'WalletActionsBottomSheet',
UNIT_TEST: 'UnitTest',
ACCOUNTS_MENU: 'AccountsMenu',
Comment thread
vinnyhoward marked this conversation as resolved.
Outdated
Comment thread
vinnyhoward marked this conversation as resolved.
Outdated
};
Loading
Loading