From 93c9274d5e7d278b15d16fb2cfe92761421c985e Mon Sep 17 00:00:00 2001 From: Maxime Aubanel Date: Mon, 18 Mar 2024 14:09:13 +0100 Subject: [PATCH] Remove depositWithdrawBannerMobile feature flag --- .../RootNavigator/ReceiveFundsNavigator.tsx | 14 ++------- .../screens/ReceiveFunds/03-Confirmation.tsx | 29 ++++++++----------- .../src/screens/ReceiveFunds/HelpButton.tsx | 7 ++--- apps/ledger-live-mobile/src/utils/urls.tsx | 1 + .../src/featureFlags/defaultFeatures.ts | 5 ---- .../packages/types-live/src/feature.ts | 5 ---- 6 files changed, 18 insertions(+), 43 deletions(-) diff --git a/apps/ledger-live-mobile/src/components/RootNavigator/ReceiveFundsNavigator.tsx b/apps/ledger-live-mobile/src/components/RootNavigator/ReceiveFundsNavigator.tsx index a297f8dffb37..740af935b886 100644 --- a/apps/ledger-live-mobile/src/components/RootNavigator/ReceiveFundsNavigator.tsx +++ b/apps/ledger-live-mobile/src/components/RootNavigator/ReceiveFundsNavigator.tsx @@ -26,7 +26,6 @@ import { ReceiveFundsStackParamList } from "./types/ReceiveFundsNavigator"; import { NavigationHeaderBackButton } from "../NavigationHeaderBackButton"; import { Flex } from "@ledgerhq/native-ui"; import HelpButton from "~/screens/ReceiveFunds/HelpButton"; -import useFeature from "@ledgerhq/live-common/featureFlags/useFeature"; import { useSelector } from "react-redux"; import { hasClosedNetworkBannerSelector, @@ -38,7 +37,6 @@ export default function ReceiveFundsNavigator() { const { colors } = useTheme(); const { t } = useTranslation(); const route = useRoute(); - const depositWithdrawBannerMobile = useFeature("depositWithdrawBannerMobile"); const hasClosedWithdrawBanner = useSelector(hasClosedWithdrawBannerSelector); const hasClosedNetworkBanner = useSelector(hasClosedNetworkBannerSelector); @@ -106,11 +104,7 @@ export default function ReceiveFundsNavigator() { headerRight: () => ( {hasClosedNetworkBanner && ( - + )} @@ -192,11 +186,7 @@ export default function ReceiveFundsNavigator() { headerRight: () => ( {hasClosedWithdrawBanner && ( - + )} { + const clickLearn = () => { track("button_clicked", { button: "How to withdraw from exchange", type: "card", page: "Receive Account Qr Code", }); // @ts-expect-error TYPINGS - Linking.openURL(depositWithdrawBannerMobile?.params?.url); - }, [depositWithdrawBannerMobile?.params?.url]); - + Linking.openURL(urls.withdrawCrypto); + }; useEffect(() => { if (route.params?.createTokenAccount && !hasAddedTokenAccount) { const newMainAccount = { ...mainAccount }; @@ -387,17 +384,15 @@ function ReceiveConfirmationInner({ navigation, route, account, parentAccount }: {t("transfer.receive.receiveConfirmation.verifyAddress")} - {depositWithdrawBannerMobile?.enabled ? ( - displayBanner ? ( - - - - ) : ( - - - - ) - ) : null} + {displayBanner ? ( + + + + ) : ( + + + + )} {verified ? null : isModalOpened ? ( diff --git a/apps/ledger-live-mobile/src/screens/ReceiveFunds/HelpButton.tsx b/apps/ledger-live-mobile/src/screens/ReceiveFunds/HelpButton.tsx index 108b0d252946..672a86dd56b0 100644 --- a/apps/ledger-live-mobile/src/screens/ReceiveFunds/HelpButton.tsx +++ b/apps/ledger-live-mobile/src/screens/ReceiveFunds/HelpButton.tsx @@ -5,11 +5,10 @@ import { Box } from "@ledgerhq/native-ui"; import { track } from "~/analytics"; type Props = { - enabled: boolean; url: string; eventButton: string; }; -const HelpButton = ({ enabled, url, eventButton }: Props) => { +const HelpButton = ({ url, eventButton }: Props) => { const onClickButton = useCallback(() => { track("button_clicked", { button: eventButton, @@ -18,13 +17,13 @@ const HelpButton = ({ enabled, url, eventButton }: Props) => { Linking.openURL(url); }, [url, eventButton]); - return enabled ? ( + return ( - ) : null; + ); }; export default HelpButton; diff --git a/apps/ledger-live-mobile/src/utils/urls.tsx b/apps/ledger-live-mobile/src/utils/urls.tsx index 2d69d0e5e471..50fc4ad637e2 100644 --- a/apps/ledger-live-mobile/src/utils/urls.tsx +++ b/apps/ledger-live-mobile/src/utils/urls.tsx @@ -147,6 +147,7 @@ export const urls = { "https://developers.ledger.com?utm_source=ledger_live_mobile&utm_medium=self_referral&utm_content=catalog", }, chooseNetwork: "https://support.ledger.com/hc/en-us/articles/7782669175581?support=true", + withdrawCrypto: "https://support.ledger.com/hc/en-us/articles/13108505155485?docs=true", approvedOperation: "https://support.ledger.com/hc/en-us/articles/360020849134-Track-your-transaction?docs=true&utm_source=ledger_live_mobile&utm_medium=self_referral&utm_content=compoundTX", recoveryPhraseInfo: diff --git a/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts b/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts index 93ec661268b9..a59c5724f009 100644 --- a/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts +++ b/libs/ledger-live-common/src/featureFlags/defaultFeatures.ts @@ -113,11 +113,6 @@ export const DEFAULT_FEATURES: Features = { params: { debug: false, url: null }, }, - depositWithdrawBannerMobile: { - enabled: false, - params: { url: "https://www.ledger.com/ledger-live" }, - }, - deviceInitialApps: { enabled: false, params: { apps: ["Bitcoin", "Ethereum"] }, diff --git a/libs/ledgerjs/packages/types-live/src/feature.ts b/libs/ledgerjs/packages/types-live/src/feature.ts index 85ba4465244f..bfd856389a44 100644 --- a/libs/ledgerjs/packages/types-live/src/feature.ts +++ b/libs/ledgerjs/packages/types-live/src/feature.ts @@ -129,7 +129,6 @@ export type Features = CurrencyFeatures & { counterValue: Feature_CounterValue; deviceInitialApps: Feature_DeviceInitialApps; buyDeviceFromLive: Feature_BuyDeviceFromLive; - depositWithdrawBannerMobile: Feature_DepositWithdrawBannerMobile; mockFeature: Feature_MockFeature; multibuyNavigation: Feature_MultibuyNavigation; referralProgramDiscoverCard: Feature_ReferralProgramDiscoverCard; @@ -350,10 +349,6 @@ export type Feature_BuyDeviceFromLive = Feature<{ url: string | null; }>; -export type Feature_DepositWithdrawBannerMobile = Feature<{ - url: string; -}>; - export type Feature_Discover = Feature<{ version: string; }>;