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

feat: move pin extension notification to main screen #902

Merged
merged 3 commits into from
Feb 29, 2024
Merged

feat: move pin extension notification to main screen #902

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c94112
feat: move pin extension notification to main screen
greatertomi Feb 20, 2024
2fdfb80
fix: start notification timeout only when modal is close
greatertomi Feb 26, 2024
a80bda7
fix: notification useEffect improvement
greatertomi Feb 26, 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
19 changes: 14 additions & 5 deletions apps/browser-extension-wallet/src/views/browser-view/components/Layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const Layout = ({ children, drawerUIDefaultContent, isFullWidth }: Layout
const backgroundServices = useBackgroundServiceAPIContext();

const [showPinExtension, { updateLocalStorage: setShowPinExtension }] = useLocalStorage('showPinExtension', true);
const [showDappBetaModal] = useLocalStorage('showDappBetaModal', true);

useEffect(() => {
const openDrawer = async () => {
Expand All @@ -56,11 +57,19 @@ export const Layout = ({ children, drawerUIDefaultContent, isFullWidth }: Layout
}, [backgroundServices, setTheme]);

useEffect(() => {
const timer = setTimeout(() => {
setShowPinExtension(false);
}, PIN_EXTENSION_TIMEOUT);
return () => clearTimeout(timer);
}, [setShowPinExtension]);
let timer: NodeJS.Timeout;
if (!showDappBetaModal) {
timer = setTimeout(() => {
setShowPinExtension(false);
}, PIN_EXTENSION_TIMEOUT);
}

return () => {
if (timer) {
clearTimeout(timer);
}
};
greatertomi marked this conversation as resolved.
Show resolved Hide resolved
}, [setShowPinExtension, showDappBetaModal]);

const debouncedToast = useMemo(() => debounce(toast.notify, toastThrottle), []);
const showNetworkError = useCallback(
Expand Down
9 changes: 4 additions & 5 deletions ...on-wallet/src/views/browser-view/features/dapp/components/DappBetaModal/DappBetaModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
import { useExternalLinkOpener } from '@providers';
import { getValueFromLocalStorage, saveValueInLocalStorage } from '@src/utils/local-storage';
import { WarningModal } from '@src/views/browser-view/components';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocalStorage } from '@hooks';

export const DappBetaModal = (): React.ReactElement => {
const { t } = useTranslation();
const [isModalVisible, setIsModalVisible] = useState(false);
const [showDappBetaModal, { updateLocalStorage: setShowDappBetaModal }] = useLocalStorage('showDappBetaModal', true);
const openExternalLink = useExternalLinkOpener();

useEffect(() => {
const showDappBetaModal = getValueFromLocalStorage('showDappBetaModal', true);
setIsModalVisible(showDappBetaModal);
}, []);
}, [showDappBetaModal]);

const onClose = () => {
saveValueInLocalStorage({ key: 'showDappBetaModal', value: false });
setShowDappBetaModal(false);
setIsModalVisible(false);
};

const onLearnMore = () => {
const showDappBetaModal = getValueFromLocalStorage('showDappBetaModal', true);
if (showDappBetaModal) openExternalLink(process.env.FAQ_URL);
onClose();
};
Expand Down
Loading