From f762e9bfaca66beb5baa607297e9b6a53d5abb92 Mon Sep 17 00:00:00 2001 From: aleka Date: Tue, 6 Feb 2024 12:31:08 -0500 Subject: [PATCH] add featureFlags to env config for reduce only + remove mobile sign in flag (#278) * add featureFlags to env config * update abacus and remove mobilesignin test flag --- package.json | 2 +- pnpm-lock.yaml | 8 +++--- public/configs/env.json | 45 +++++++++++++++++++++++++++++++++ src/lib/testFlags.ts | 4 --- src/views/menus/AccountMenu.tsx | 6 ++--- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index b03fda7..796147b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@cosmjs/proto-signing": "^0.32.1", "@cosmjs/stargate": "^0.32.1", "@cosmjs/tendermint-rpc": "^0.32.1", - "@dydxprotocol/v4-abacus": "^1.4.0", + "@dydxprotocol/v4-abacus": "^1.4.2", "@dydxprotocol/v4-client-js": "^1.0.20", "@dydxprotocol/v4-localization": "^1.1.22", "@ethersproject/providers": "^5.7.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 28f3fa6..06320de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,8 +26,8 @@ dependencies: specifier: ^0.32.1 version: 0.32.2 '@dydxprotocol/v4-abacus': - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.2 + version: 1.4.2 '@dydxprotocol/v4-client-js': specifier: ^1.0.20 version: 1.0.20 @@ -1088,8 +1088,8 @@ packages: resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} dev: true - /@dydxprotocol/v4-abacus@1.4.0: - resolution: {integrity: sha512-mkdkXQXTVF1K6UmZwIwLC9gjsXg+Nt3h5/iW+WriVv1cUMPmHfPyRWL31eDDvkVO5UeECf05kiYXPk1y+7dPuA==} + /@dydxprotocol/v4-abacus@1.4.2: + resolution: {integrity: sha512-+hugk0RulMwMthR2xCMYXohcC3sEYqVW/lmiq0RUuHZ9yrjmgy48xl0aZUmXGUYXyoiHXPS4AULhRKHQ4OOLwg==} dev: false /@dydxprotocol/v4-client-js@1.0.20: diff --git a/public/configs/env.json b/public/configs/env.json index ce84f7a..913e22c 100644 --- a/public/configs/env.json +++ b/public/configs/env.json @@ -122,6 +122,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-dev-2": { @@ -201,6 +204,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-dev-4": { @@ -281,6 +287,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-dev-5": { @@ -360,6 +369,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-staging": { @@ -441,6 +453,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-staging-forced-update": { @@ -521,6 +536,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-staging-west": { @@ -602,6 +620,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": true } }, "dydxprotocol-testnet": { @@ -687,6 +708,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-dydx": { @@ -769,6 +793,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-nodefleet": { @@ -851,6 +878,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-kingnodes": { @@ -933,6 +963,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-liquify": { @@ -1015,6 +1048,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-polkachu": { @@ -1089,6 +1125,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-testnet-bware": { @@ -1171,6 +1210,9 @@ "delayBlocks": 900, "newMarketsMethodology": "https://docs.google.com/spreadsheets/d/1zjkV9R7R_7KMItuzqzvKGwefSBRfE-ZNAx1LH55OcqY/edit?usp=sharing" } + }, + "featureFlags": { + "reduceOnlySupported": false } }, "dydxprotocol-mainnet": { @@ -1253,6 +1295,9 @@ "delayBlocks": 0, "newMarketsMethodology": "[URL to spreadsheet or document that explains methodology]" } + }, + "featureFlags": { + "reduceOnlySupported": false } } } diff --git a/src/lib/testFlags.ts b/src/lib/testFlags.ts index 36f8a8b..a3e1a62 100644 --- a/src/lib/testFlags.ts +++ b/src/lib/testFlags.ts @@ -19,10 +19,6 @@ class TestFlags { return !!this.queryParams.displayinitializingmarkets; } - get showMobileSignInOption() { - return !!this.queryParams.mobilesignin; - } - get addressOverride():string { return this.queryParams.address; } diff --git a/src/views/menus/AccountMenu.tsx b/src/views/menus/AccountMenu.tsx index ac7bc6f..af4cb80 100644 --- a/src/views/menus/AccountMenu.tsx +++ b/src/views/menus/AccountMenu.tsx @@ -7,7 +7,6 @@ import { OnboardingState } from '@/constants/account'; import { ButtonAction, ButtonShape, ButtonSize, ButtonType } from '@/constants/buttons'; import { DialogTypes } from '@/constants/dialogs'; import { STRING_KEYS, StringGetterFunction, TOOLTIP_STRING_KEYS } from '@/constants/localization'; -import { isMainnet } from '@/constants/networks'; import { DydxChainAsset, wallets } from '@/constants/wallets'; import { layoutMixins } from '@/styles/layoutMixins'; @@ -41,7 +40,6 @@ import { getAppTheme } from '@/state/configsSelectors'; import { isTruthy } from '@/lib/isTruthy'; import { truncateAddress } from '@/lib/wallet'; import { MustBigNumber } from '@/lib/numbers'; -import { testFlags } from '@/lib/testFlags'; export const AccountMenu = () => { const stringGetter = useStringGetter(); @@ -193,7 +191,7 @@ export const AccountMenu = () => { }, ...(onboardingState === OnboardingState.AccountConnected && hdKey ? [ - (!isMainnet || testFlags.showMobileSignInOption) && { + { value: 'MobileQrSignIn', icon: , label: stringGetter({ key: STRING_KEYS.TITLE_SIGN_INTO_MOBILE }), @@ -206,7 +204,7 @@ export const AccountMenu = () => { highlightColor: 'destroy', onSelect: () => dispatch(openDialog({ type: DialogTypes.MnemonicExport })), }, - ].filter(isTruthy) + ] : []), { value: 'Disconnect',