Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: logic for using notifications tabs #25350

Merged
merged 3 commits into from
Jun 18, 2024
Merged

fix: logic for using notifications tabs #25350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a72bf8
fix: :bug: fix for the logic for using tabs
matteoscurati Jun 15, 2024
53b7997
Merge branch 'develop' into fix/no-multi-columnr-list-when-no-snaps-i…
matteoscurati Jun 17, 2024
0cfaf8f
Merge branch 'develop' into fix/no-multi-columnr-list-when-no-snaps-i…
matteoscurati Jun 18, 2024
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
2 changes: 2 additions & 0 deletions ui/pages/notifications/notifications.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Provider } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import configureStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import mockState from '../../../test/data/mock-state.json';
import Notifications from './notifications';

const mockDispatch = jest.fn();
Expand Down Expand Up @@ -32,6 +33,7 @@ jest.mock('../../store/actions', () => ({

const initialState = {
metamask: {
...mockState.metamask,
theme: 'light',
isMetamaskNotificationsEnabled: true,
isFeatureAnnouncementsEnabled: true,
Expand Down
95 changes: 49 additions & 46 deletions ui/pages/notifications/notifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import { NotificationsPage } from '../../components/multichain';
import { Content, Header } from '../../components/multichain/pages/page';
import { useMetamaskNotificationsContext } from '../../contexts/metamask-notifications/metamask-notifications';
import { getNotifications } from '../../selectors';
import { getNotifications, getNotifySnaps } from '../../selectors';
import {
selectIsFeatureAnnouncementsEnabled,
selectIsMetamaskNotificationsEnabled,
Expand Down Expand Up @@ -142,17 +142,15 @@ const filterNotifications = (
}

if (activeTab === TAB_KEYS.WALLET) {
return notifications.filter((notification) =>
TRIGGER_TYPES_WALLET_SET.has(notification.type),
return notifications.filter(
(notification) =>
TRIGGER_TYPES_WALLET_SET.has(notification.type) ||
notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT,
);
}

if (activeTab === TAB_KEYS.WEB3) {
return notifications.filter(
(notification) =>
notification.type === TRIGGER_TYPES.FEATURES_ANNOUNCEMENT ||
notification.type === 'SNAP',
);
return notifications.filter((notification) => notification.type === 'SNAP');
}

return notifications;
Expand All @@ -172,6 +170,9 @@ export default function Notifications() {
[activeTab, combinedNotifications],
);

let hasNotifySnaps = false;
hasNotifySnaps = useSelector(getNotifySnaps).length > 0;

return (
<NotificationsPage>
{/* Back and Settings Buttons */}
Expand Down Expand Up @@ -202,44 +203,46 @@ export default function Notifications() {
>
{t('notifications')}
</Header>
<Content paddingLeft={0} paddingRight={0}>
<Tabs
defaultActiveTabKey={activeTab}
onTabClick={(tab) => setActiveTab(tab)}
tabsClassName="notifications__tabs"
>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.ALL}
name={t('all')}
tabKey={TAB_KEYS.ALL}
/>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.WALLET}
name={
<Box
display={Display.Flex}
justifyContent={JustifyContent.center}
alignItems={AlignItems.center}
gap={2}
>
{t('wallet')}
<NewFeatureTag />
</Box>
}
tabKey={TAB_KEYS.WALLET}
></Tab>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.WEB3}
name={t('web3')}
tabKey={TAB_KEYS.WEB3}
/>
</Tabs>
<Content paddingLeft={0} paddingRight={0} paddingTop={0}>
{hasNotifySnaps && (
<Tabs
defaultActiveTabKey={activeTab}
onTabClick={(tab) => setActiveTab(tab)}
tabsClassName="notifications__tabs"
>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.ALL}
name={t('all')}
tabKey={TAB_KEYS.ALL}
/>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.WALLET}
name={
<Box
display={Display.Flex}
justifyContent={JustifyContent.center}
alignItems={AlignItems.center}
gap={2}
>
{t('wallet')}
<NewFeatureTag />
</Box>
}
tabKey={TAB_KEYS.WALLET}
></Tab>
<Tab
activeClassName="notifications__tab--active"
className="notifications__tab"
data-testid={TAB_KEYS.WEB3}
name={t('web3')}
tabKey={TAB_KEYS.WEB3}
/>
</Tabs>
)}
<NotificationsList
activeTab={activeTab}
notifications={filteredNotifications}
Expand Down