From bf301f919708f7648b4d6c25add5281eee262dfd Mon Sep 17 00:00:00 2001 From: Hakim <59644786+haammar-ledger@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:38:36 +0200 Subject: [PATCH] [bugfix] Polygon zk evm feature flag (#4206) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :rocket: entering prerelease mode * :rocket: release prerelease [LLD(2.63.0-next.0), LLM(3.26.0-next.0)] * fix(Firmware Update LLM): fix manager reload during update (#3846) * :rocket: release prerelease [LLD(2.63.0-next.0), LLM(3.26.0-next.1)] * [LIVE-8231] Bugfix - Fix ethers shims for React Native not applied (#3872) * Fix name file for RN support with shims * changeset * :rocket: release prerelease [LLD(2.63.0-next.1), LLM(3.26.0-next.2)] * bugfix(LLM): fix icons aligment on new Onboarding (#3871) * bugfix(LLM): fix icons aligment on new Onboarding * Add changeset * Polishing * :rocket: release prerelease [LLD(2.63.0-next.1), LLM(3.26.0-next.3)] * fix(DeviceActionImplementations): fix flickering on device actions (#3875) * :rocket: release prerelease [LLD(2.63.0-next.2), LLM(3.26.0-next.4)] * Chore: smartling translations 20230704125053021 (#3900) * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ar-AE locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to zh-CN locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to fr-FR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to de-DE locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ja-JP locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ko-KR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to pt-BR locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to ru-RU locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to es-ES locale * File apps/ledger-live-mobile/src/locales/en/common.json was translated to tr-TR locale --------- Co-authored-by: ldg-smartling-sa <133769770+ldg-smartling-sa@users.noreply.github.com> * chore(release): :rocket: prepare release [skip ci] * chore(prerelease): :rocket: entering prerelease mode * chore(prerelease): :rocket: release prerelease [LLD(2.64.0-next.0), LLM(3.27.0-next.0)] * [bugfix] Disable default derivation scheme for ICP, only use custom one (#4011) * chore(prerelease): :rocket: release prerelease [LLD(2.64.0-next.1), LLM(3.27.0-next.1)] * [LIVE-8490] Bugfix - Fix wrong `shouldSkipAmount` in LLM send flow (#4024) * Fix wrong `shouldSkipAmount` in LLM send flow * changeset * chore(prerelease): :rocket: release prerelease [LLD(2.64.0-next.1), LLM(3.27.0-next.2)] * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ar-AE locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to zh-CN locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to fr-FR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to de-DE locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ja-JP locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ko-KR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to pt-BR locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to ru-RU locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to es-ES locale * File apps/ledger-live-desktop/static/i18n/en/app.json was translated to tr-TR locale * Update RELEASE_NOTES.md * chore(release): :rocket: prepare release [skip ci] * chore(hotfix) :rocket: entering hotfix mode * fix: release note version * add changelog * chore(hotfix): :fire: hotfix prerelease [LLD(2.64.1-hotfix.0), LLM(3.27.0)] * fixup! fix: release note version * chore(hotfix): :fire: hotfix release [skip ci] * chore(hotfix) :rocket: entering hotfix mode * Remove .gitignores preventing correct publishing * changeset * chore(hotfix): :fire: hotfix prerelease [LLD(2.64.2-hotfix.0), LLM(3.27.1-hotfix.0)] * fix: patch on usb package based on hotfix (#4105) fix: patch delay on USB hotplug for Windows Patches the node-usb package * chore(hotfix): :fire: hotfix prerelease [LLD(2.64.2-hotfix.1), LLM(3.27.1-hotfix.0)] * Update RELEASE_NOTES.md * chore(hotfix): :fire: hotfix release [skip ci] * chore(prerelease): :rocket: entering prerelease mode * chore(prerelease): :rocket: release prerelease [LLD(2.65.0-next.0), LLM(3.28.0-next.0)] * 📝 [FEAT] - LLM - Rephrase refer a friend banner in BTC account (#4185) * 📝 [FEAT] - LLM - Rephrase refer a friend banner in BTC account * add changeset * chore(prerelease): :rocket: release prerelease [LLD(2.65.0-next.0), LLM(3.28.0-next.1)] * Fix feature flag for Polygon Zk EVM * Add changeset --------- Co-authored-by: live-github-bot[bot] <105061298+live-github-bot[bot]@users.noreply.github.com> Co-authored-by: Gabriel Restori Soares Co-authored-by: 0xkvn <44363395+lambertkevin@users.noreply.github.com> Co-authored-by: Martin CAYUELAS <112866305+mcayuelas-ledger@users.noreply.github.com> Co-authored-by: sarneijim <38540290+sarneijim@users.noreply.github.com> Co-authored-by: ldg-smartling-sa <133769770+ldg-smartling-sa@users.noreply.github.com> Co-authored-by: Alexandre Chabrolin <9203826+chabroA@users.noreply.github.com> Co-authored-by: Desifly Co-authored-by: lambertkevin Co-authored-by: Alexandre Magaud --- .changeset/eight-rockets-behave.md | 6 ++++++ .../AddAccounts/steps/StepChooseCurrency.tsx | 20 ++++++++++--------- .../screens/AddAccounts/01-SelectCrypto.tsx | 20 ++++++++++--------- 3 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 .changeset/eight-rockets-behave.md diff --git a/.changeset/eight-rockets-behave.md b/.changeset/eight-rockets-behave.md new file mode 100644 index 000000000000..912c6123e5cc --- /dev/null +++ b/.changeset/eight-rockets-behave.md @@ -0,0 +1,6 @@ +--- +"ledger-live-desktop": patch +"live-mobile": patch +--- + +Fix feature flag for Polygon Zk EVM diff --git a/apps/ledger-live-desktop/src/renderer/modals/AddAccounts/steps/StepChooseCurrency.tsx b/apps/ledger-live-desktop/src/renderer/modals/AddAccounts/steps/StepChooseCurrency.tsx index dfadc0eea411..ca35690ee626 100644 --- a/apps/ledger-live-desktop/src/renderer/modals/AddAccounts/steps/StepChooseCurrency.tsx +++ b/apps/ledger-live-desktop/src/renderer/modals/AddAccounts/steps/StepChooseCurrency.tsx @@ -57,14 +57,16 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => { const internetComputer = useFeature("currencyInternetComputer"); const telosEvm = useFeature("currencyTelosEvm"); const coreum = useFeature("currencyCoreum"); - const polygon_zk_evm = useFeature("currencyPolygonZkEvm"); - const polygon_zk_evm_testnet = useFeature("currencyPolygonZkEvmTestnet"); + const polygonZkEvm = useFeature("currencyPolygonZkEvm"); + const polygonZkEvmTestnet = useFeature("currencyPolygonZkEvmTestnet"); const base = useFeature("currencyBase"); - const base_goerli = useFeature("currencyBaseGoerli"); + const baseGoerli = useFeature("currencyBaseGoerli"); const klaytn = useFeature("currencyKlaytn"); const featureFlaggedCurrencies = useMemo( () => ({ + // Keys in this list must match an existing currency.id + // Pay attention to the case! axelar, stargaze, secretNetwork, @@ -93,10 +95,10 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => { internet_computer: internetComputer, telos: telosEvm, coreum, - polygonZkEvm: polygon_zk_evm, - polygonZkEvmTestnet: polygon_zk_evm_testnet, + polygon_zk_evm: polygonZkEvm, + polygon_zk_evm_testnet: polygonZkEvmTestnet, base, - baseGoerli: base_goerli, + base_goerli: baseGoerli, klaytn, }), [ @@ -128,10 +130,10 @@ const StepChooseCurrency = ({ currency, setCurrency }: StepProps) => { internetComputer, telosEvm, coreum, - polygon_zk_evm, - polygon_zk_evm_testnet, + polygonZkEvm, + polygonZkEvmTestnet, base, - base_goerli, + baseGoerli, klaytn, ], ); diff --git a/apps/ledger-live-mobile/src/screens/AddAccounts/01-SelectCrypto.tsx b/apps/ledger-live-mobile/src/screens/AddAccounts/01-SelectCrypto.tsx index 98b156afedc6..8298255148a5 100644 --- a/apps/ledger-live-mobile/src/screens/AddAccounts/01-SelectCrypto.tsx +++ b/apps/ledger-live-mobile/src/screens/AddAccounts/01-SelectCrypto.tsx @@ -80,14 +80,16 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) { const internetComputer = useFeature("currencyInternetComputer"); const telosEvm = useFeature("currencyTelosEvm"); const coreum = useFeature("currencyCoreum"); - const polygon_zk_evm = useFeature("currencyPolygonZkEvm"); - const polygon_zk_evm_testnet = useFeature("currencyPolygonZkEvmTestnet"); + const polygonZkEvm = useFeature("currencyPolygonZkEvm"); + const polygonZkEvmTestnet = useFeature("currencyPolygonZkEvmTestnet"); const base = useFeature("currencyBase"); - const base_goerli = useFeature("currencyBaseGoerli"); + const baseGoerli = useFeature("currencyBaseGoerli"); const klaytn = useFeature("currencyKlaytn"); const featureFlaggedCurrencies = useMemo( () => ({ + // Keys in this list must match an existing currency.id + // Pay attention to the case! axelar, stargaze, umee, @@ -116,10 +118,10 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) { internet_computer: internetComputer, telos: telosEvm, coreum, - polygonZkEvm: polygon_zk_evm, - polygonZkEvmTestnet: polygon_zk_evm_testnet, + polygon_zk_evm: polygonZkEvm, + polygon_zk_evm_testnet: polygonZkEvmTestnet, base, - baseGoerli: base_goerli, + base_goerli: baseGoerli, klaytn, }), [ @@ -151,10 +153,10 @@ export default function AddAccountsSelectCrypto({ navigation, route }: Props) { internetComputer, telosEvm, coreum, - polygon_zk_evm, - polygon_zk_evm_testnet, + polygonZkEvm, + polygonZkEvmTestnet, base, - base_goerli, + baseGoerli, klaytn, ], );