fix: disable notifications when basic functionality off #28045
Merged
+65
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
matteoscurati
commented
Oct 24, 2024
| @@ -83,6 +85,9 @@ export function useDisableProfileSyncing(): { | |||
| try { | |||
| // disable profile syncing | |||
| await dispatch(disableProfileSyncingAction()); | |||
|
|
|||
| // list notifications to update the counter | |||
| await listNotifications(); | |||
There was a problem hiding this comment.
Updating the list after the notifications have been disabled, the counter is set to zero
There was a problem hiding this comment.
nice, we can ticket this for a core change in future.
matteoscurati
commented
Oct 24, 2024
| @@ -74,15 +74,14 @@ export function NotificationsSettingsAllowNotifications({ | |||
| }, [isMetamaskNotificationsEnabled]); | |||
|
|
|||
| useEffect(() => { | |||
| if (isMetamaskNotificationsEnabled && !error) { | |||
| if (!error) { | |||
There was a problem hiding this comment.
In this way, the update of the list and therefore the counter is triggered even when the notifications are disabled
There was a problem hiding this comment.
We need to update the list when the notifications are enabled AND disabled (because we want to reset the counter)
FUTURE - move logic to core library instead of doing this error/reset.
matteoscurati
changed the title
…b.com:MetaMask/metamask-extension into fix/basic-functionality-disable-notifications
| @@ -31,14 +30,14 @@ import { getUseExternalServices } from '../../../../selectors'; | |||
|
|
|||
| function ProfileSyncBasicFunctionalitySetting() { | |||
| const basicFunctionality: boolean = useSelector(getUseExternalServices); | |||
| const { setIsProfileSyncingEnabled } = useSetIsProfileSyncingEnabled(); | |||
| const { disableProfileSyncing } = useDisableProfileSyncing(); | |||
There was a problem hiding this comment.
Nice, this hook will disable profile syncing and disable notifications.
FUTURE - we probs want to clean up the hooks.
ui/pages/settings/security-tab/profile-sync-toggle/profile-sync-toggle.tsx
Show resolved
Hide resolved
Prithpal-Sooriya
approved these changes
Oct 24, 2024
Builds ready [6a5814f]
Page Load Metrics (2071 ± 109 ms)
Bundle size diffs
|
mathieuartu
approved these changes
Oct 24, 2024
matteoscurati
deleted the
fix/basic-functionality-disable-notifications
branch
metamaskbot
added
the
release-12.7.0
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR ensures that notifications are correctly disabled when the user deactivates Basic functionality. The current implementation only disables profile sync when Basic functionality is turned off, leaving notifications in an incorrect state—they can’t be fetched but remain active. This causes a series of UI errors, the most obvious being that the counters stay visible.
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
After
Pre-merge author checklist
Pre-merge reviewer checklist