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

[IMPROVEMENT] Screenshot deterrent alert #5474

Merged
merged 3 commits into from
Jan 13, 2023
Merged

[IMPROVEMENT] Screenshot deterrent alert #5474

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
0c9f86f
Update alert modal
gantunesr Dec 28, 2022
2b14ec3
Solve conflicts
gantunesr Jan 11, 2023
e4b33fb
Fix dismiss modal issue
gantunesr Jan 11, 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
47 changes: 24 additions & 23 deletions app/components/UI/ScreenshotDeterrent/ScreenshotDeterrent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import React, { useState, useEffect, useCallback } from 'react';
import { View, Alert, Linking, InteractionManager } from 'react-native';
import { View, Linking, InteractionManager } from 'react-native';
import { useNavigation } from '@react-navigation/native';
import PreventScreenshot from '../../../core/PreventScreenshot';
import { MetaMetricsEvents } from '../../../core/Analytics';
import AnalyticsV2 from '../../../util/analyticsV2';
import useScreenshotDeterrent from '../../hooks/useScreenshotDeterrent';
import { SRP_GUIDE_URL } from '../../../constants/urls';
import Routes from '../../../constants/navigation/Routes';
import { strings } from '../../../../locales/i18n';
import { ModalConfirmationVariants } from '../../../component-library/components/Modals/ModalConfirmation';

const ScreenshotDeterrent = ({
enabled,
Expand All @@ -15,6 +18,7 @@ const ScreenshotDeterrent = ({
isSRP: boolean;
}) => {
const [alertPresent, setAlertPresent] = useState<boolean>(false);
const navigation = useNavigation();

const openSRPGuide = () => {
setAlertPresent(false);
Expand All @@ -26,29 +30,26 @@ const ScreenshotDeterrent = ({
AnalyticsV2.trackEvent(MetaMetricsEvents.SCREENSHOT_WARNING, {});
setAlertPresent(true);

Alert.alert(
strings('screenshot_deterrent.title'),
strings('screenshot_deterrent.description', {
credentialName: isSRP
? strings('screenshot_deterrent.srp_text')
: strings('screenshot_deterrent.priv_key_text'),
}),
[
{
text: strings('reveal_credential.learn_more'),
onPress: openSRPGuide,
style: 'cancel',
navigation.navigate(Routes.MODAL.ROOT_MODAL_FLOW, {
screen: Routes.MODAL.MODAL_CONFIRMATION,
params: {
variant: ModalConfirmationVariants.Normal,
title: strings('screenshot_deterrent.title'),
description: strings('screenshot_deterrent.description', {
credentialName: isSRP
? strings('screenshot_deterrent.srp_text')
: strings('screenshot_deterrent.priv_key_text'),
}),
onCancel: () => {
setAlertPresent(false);
AnalyticsV2.trackEvent(MetaMetricsEvents.SCREENSHOT_OK, {});
},
{
text: strings('reveal_credential.got_it'),
onPress: () => {
setAlertPresent(false);
AnalyticsV2.trackEvent(MetaMetricsEvents.SCREENSHOT_OK, {});
},
},
],
);
}, [isSRP]);
onConfirm: openSRPGuide,
confirmLabel: strings('reveal_credential.learn_more'),
cancelLabel: strings('reveal_credential.got_it'),
},
});
}, [isSRP, navigation]);

const [enableScreenshotWarning] = useScreenshotDeterrent(showScreenshotAlert);

Expand Down
2 changes: 1 addition & 1 deletion locales/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,7 @@
"new_wallet_needed_create_new_wallet_action": "Create a new wallet",
"new_wallet_needed_create_try_again_action": "Try recovering wallet",
"new_wallet_needed_description_part_one": "Something's wrong with your wallet, and you'll need to create a new one. Because your accounts are on the blockchain, they're still safe. Only the preferences, saved networks, account names, and related data saved on your device are gone.",
"new_wallet_needed_description_part_two":"To import your accounts to a new wallet, you'll need your Secret Recovery Phrase. If you don't have your Secret Recovery Phrase, you won't be able to import your accounts.",
"new_wallet_needed_description_part_two": "To import your accounts to a new wallet, you'll need your Secret Recovery Phrase. If you don't have your Secret Recovery Phrase, you won't be able to import your accounts.",
"new_wallet_needed_description_part_three": "To keep this from happening again, be sure to always keep your MetaMask app and OS updated to the latest version."
}
}