diff --git a/package.json b/package.json index fdf2705..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": "file:/Users/alekacheung/Documents/dydx/v4/v4-abacus/build/packages/js/dydxprotocol-v4-abacus-1.4.2.tgz", + "@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 e3168c0..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: file:/Users/alekacheung/Documents/dydx/v4/v4-abacus/build/packages/js/dydxprotocol-v4-abacus-1.4.2.tgz - version: file:../v4-abacus/build/packages/js/dydxprotocol-v4-abacus-1.4.2.tgz + specifier: ^1.4.2 + version: 1.4.2 '@dydxprotocol/v4-client-js': specifier: ^1.0.20 version: 1.0.20 @@ -1088,6 +1088,10 @@ packages: resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} dev: true + /@dydxprotocol/v4-abacus@1.4.2: + resolution: {integrity: sha512-+hugk0RulMwMthR2xCMYXohcC3sEYqVW/lmiq0RUuHZ9yrjmgy48xl0aZUmXGUYXyoiHXPS4AULhRKHQ4OOLwg==} + dev: false + /@dydxprotocol/v4-client-js@1.0.20: resolution: {integrity: sha512-dXKW2NC1XlVVIRKvHWVDofLZSCPTJAaRY5eXzxH5CcXpnl2kdXorr7ykqWZxW0jHFPWWvRSJtUDqZN1qFrEe/w==} dependencies: @@ -14909,12 +14913,6 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - file:../v4-abacus/build/packages/js/dydxprotocol-v4-abacus-1.4.2.tgz: - resolution: {integrity: sha512-YD3RdvPTVVqjV1kmfTLuiAbRQUyraf88XimURekzeYXYhioodqxLFSdHU8Sp6BmyWP98TM4JaOCIeijoH0vgFQ==, tarball: file:../v4-abacus/build/packages/js/dydxprotocol-v4-abacus-1.4.2.tgz} - name: '@dydxprotocol/v4-abacus' - version: 1.4.2 - dev: false - settings: autoInstallPeers: true excludeLinksFromLockfile: 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',