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

fix: don't show banner if preferences exist #2596

Merged
merged 3 commits into from
Oct 6, 2023
Merged

fix: don't show banner if preferences exist #2596

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac6276
fix: don't show banner if preferences exist
iamacook Oct 6, 2023
6d36fb7
fix: rename notification feature variables
iamacook Oct 6, 2023
745616e
fix: add tests
iamacook Oct 6, 2023
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
6 changes: 4 additions & 2 deletions src/components/settings/PushNotifications/PushNotificationsBanner/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,15 @@ export const PushNotificationsBanner = ({ children }: { children: ReactElement }
const { query } = useRouter()
const onboard = useOnboard()

const { getPreferences, getAllPreferences } = useNotificationPreferences()
const { dismissPushNotificationBanner, isPushNotificationBannerDismissed } = useDismissPushNotificationsBanner()

const isSafeAdded = !!addedSafesOnChain?.[safeAddress]
const shouldShowBanner = isNotificationsEnabled && !isPushNotificationBannerDismissed && isSafeAdded
const isSafeRegistered = getPreferences(safe.chainId, safeAddress)
iamacook marked this conversation as resolved.
Show resolved Hide resolved
const shouldShowBanner =
isNotificationsEnabled && !isPushNotificationBannerDismissed && isSafeAdded && !isSafeRegistered
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you rename isNotificationsEnabled to something like isFeatureEnabled? It's confusing wrt user enabling notifications/allowing push notifications.


const { registerNotifications } = useNotificationRegistrations()
const { getAllPreferences } = useNotificationPreferences()

const dismissBanner = useCallback(() => {
trackEvent(PUSH_NOTIFICATION_EVENTS.DISMISS_BANNER)
Expand Down
Loading