diff --git a/.changeset/silly-rice-push.md b/.changeset/silly-rice-push.md new file mode 100644 index 000000000000..fc027a94e486 --- /dev/null +++ b/.changeset/silly-rice-push.md @@ -0,0 +1,5 @@ +--- +"live-mobile": patch +--- + +Skip drawer when user clicks on delete Sync + update copy diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json index 82704f2a1f96..9c069903925b 100644 --- a/apps/ledger-live-mobile/src/locales/en/common.json +++ b/apps/ledger-live-mobile/src/locales/en/common.json @@ -6793,21 +6793,15 @@ "description": "Synchronize your accounts with another Ledger Live app for a seamless experience." }, "manageKey": { - "title": "Manage Key", - "description": "Secure or delete your encryption key via another Ledger.", - "success": "Your devices have been unsynchronized and your key has been deleted", - "drawer": { - "step1": { - "title": "Manage your key", - "titleCta": "Delete your key", - "descCta": "All synced accounts will be removed. This won’t affect your local accounts." - }, - "step2": { - "delete": "Delete", - "cancel": "Cancel", - "title": "Do you really want to delete your encryption key?", - "desc": "By clicking delete, your apps will be unsynchronized, and your backup will be deleted. Rest assured, this action does not affect your funds or your accounts in Ledger Live. You may resync your accounts at any time." - } + "title": "Delete Sync", + "description": "Your crypto accounts across different phones and computers will stop synching.", + "success": "Your Ledger Live apps are no longer synched", + "successHint": "You can turn on sync again anytime.", + "confirm": { + "delete": "Yes, delete", + "cancel": "Keep sync", + "title": "Sure you want delete sync?", + "desc": "Your crypto accounts on different phones and computers will stop being in sync. This does not impact your funds in any way." } }, "manageInstances": { diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageInstances.integration.test.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageInstances.integration.test.tsx index 04ec052ca800..cb832e461011 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageInstances.integration.test.tsx +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageInstances.integration.test.tsx @@ -146,6 +146,6 @@ describe("ManageInstances", () => { await user.press(screen.getAllByText("Remove")[0]); expect(screen.getByText(/You can’t remove the current instance/i)).toBeDefined(); await user.press(await screen.findByText(/Delete my encryption key/i)); - await waitFor(() => screen.findByText(/Manage your key/i)); + await waitFor(() => screen.findByText(/Sure you want delete sync?/i)); }); }); diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageKey.integration.test.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageKey.integration.test.tsx index a229c96cd4ea..c3abb5b99bbc 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageKey.integration.test.tsx +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/manageKey.integration.test.tsx @@ -60,24 +60,14 @@ describe("ManageKey", () => { await user.press(await screen.findByText(/ledger sync/i)); //Manage Key Flow - expect(await screen.findByText(/Manage Key/i)).toBeVisible(); + expect(await screen.findByText(/Delete Sync/i)).toBeVisible(); - await user.press(await screen.findByText(/Manage Key/i)); + await user.press(await screen.findByText(/Delete Sync/i)); - expect(await screen.findByText(/Delete your key/i)).toBeVisible(); - - await user.press(await screen.findByText(/Delete your key/i)); - - expect( - await screen.findByText(/Do you really want to delete your encryption key?/i), - ).toBeVisible(); + expect(await screen.findByText(/Sure you want delete sync?/i)).toBeVisible(); await user.press(await screen.findByTestId("delete-trustchain")); - expect( - await screen.findByText( - /Your devices have been unsynchronized and your key has been deleted/i, - ), - ).toBeVisible(); + expect(await screen.findByText(/Your Ledger Live apps are no longer synched/i)).toBeVisible(); }); }); diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/walletSyncActivated.integration.test.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/walletSyncActivated.integration.test.tsx index a64a4185928c..46b570a1e8a1 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/walletSyncActivated.integration.test.tsx +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/__integrations__/walletSyncActivated.integration.test.tsx @@ -52,7 +52,7 @@ describe("WalletSyncActivated", () => { // Check if the activated screen is visible - expect(await screen.findByText(/Manage Key/i)).toBeVisible(); + expect(await screen.findByText(/Delete Sync/i)).toBeVisible(); expect(await screen.findByText(/Manage now/i)).toBeVisible(); }); diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/Confirm.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/Confirm.tsx index f1fc36517a79..1ed58ae7db78 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/Confirm.tsx +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/Confirm.tsx @@ -13,22 +13,22 @@ export function ConfirmManageKey({ onClickConfirm, onCancel }: Props) { return ( - {t("walletSync.walletSyncActivated.manageKey.drawer.step2.title")} + {t("walletSync.walletSyncActivated.manageKey.confirm.title")} - {t("walletSync.walletSyncActivated.manageKey.drawer.step2.desc")} + {t("walletSync.walletSyncActivated.manageKey.confirm.desc")} diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/ManageKey.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/ManageKey.tsx deleted file mode 100644 index 1b8ddfac5fcf..000000000000 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/components/ManageKey/ManageKey.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import React from "react"; - -import { Flex, Icons, rgba, Text } from "@ledgerhq/native-ui"; -import { TouchableOpacity } from "react-native"; -import styled, { useTheme } from "styled-components/native"; -import { useTranslation } from "react-i18next"; -import { TrackScreen } from "~/analytics"; -import { AnalyticsPage } from "../../hooks/useLedgerSyncAnalytics"; - -type Props = { - onClickDelete: () => void; -}; - -export function ManageKey({ onClickDelete }: Props) { - const { t } = useTranslation(); - const { colors } = useTheme(); - return ( - - - - {t("walletSync.walletSyncActivated.manageKey.drawer.step1.title")} - - - - - - - - - {t("walletSync.walletSyncActivated.manageKey.drawer.step1.titleCta")} - - - {t("walletSync.walletSyncActivated.manageKey.drawer.step1.descCta")} - - - - - - ); -} - -const Card = styled(TouchableOpacity)``; diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/DeletionSuccess.tsx b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/DeletionSuccess.tsx index a7a8d8cfce44..ae88925d8def 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/DeletionSuccess.tsx +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/DeletionSuccess.tsx @@ -26,6 +26,7 @@ export function WalletSyncManageKeyDeletionSuccess({ navigation }: Props) { return ( { @@ -36,12 +33,8 @@ const ManageKeyDrawer = ({ ); } - if (scene === Scene.Manage) { - return ; - } - if (scene === Scene.Confirm) { - return ; - } + + return ; }; return ( diff --git a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/useManageKeyDrawer.ts b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/useManageKeyDrawer.ts index a82e22a20424..87b232f6ab8d 100644 --- a/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/useManageKeyDrawer.ts +++ b/apps/ledger-live-mobile/src/newArch/features/WalletSync/screens/ManageKey/useManageKeyDrawer.ts @@ -1,5 +1,5 @@ import { useNavigation } from "@react-navigation/native"; -import { useState, useCallback } from "react"; +import { useCallback } from "react"; import { StackNavigatorNavigation } from "~/components/RootNavigator/types/helpers"; import { WalletSyncNavigatorStackParamList } from "~/components/RootNavigator/types/WalletSyncNavigator"; import { ScreenName } from "~/const"; @@ -14,18 +14,11 @@ import { AnalyticsButton, AnalyticsPage } from "../../hooks/useLedgerSyncAnalyti const messageLog = "Follow Steps on device"; -export enum Scene { - Manage, - Confirm, -} - export type HookResult = { isDrawerVisible: boolean; openDrawer: () => void; closeDrawer: () => void; handleClose: () => void; - onClickDelete: () => void; - scene: Scene; onClickConfirm: () => Promise; deleteMutation: UseMutationResult; handleCancel: () => void; @@ -38,16 +31,6 @@ export const useManageKeyDrawer = () => { const dispatch = useDispatch(); - const [scene, setScene] = useState(Scene.Manage); - - const onClickDelete = () => { - track("button_clicked", { - button: AnalyticsButton.DeleteKey, - page: AnalyticsPage.ManageBackup, - }); - setScene(Scene.Confirm); - }; - const openDrawer = useCallback(() => { dispatch(setWallectSyncManageKeyDrawer(true)); @@ -55,7 +38,6 @@ export const useManageKeyDrawer = () => { }, [dispatch]); const closeDrawer = useCallback(() => { - setScene(Scene.Manage); dispatch(setWallectSyncManageKeyDrawer(false)); logDrawer(messageLog, "close"); }, [dispatch]); @@ -95,8 +77,6 @@ export const useManageKeyDrawer = () => { openDrawer, closeDrawer, handleClose, - onClickDelete, - scene, onClickConfirm, deleteMutation, handleCancel,