From 5b06110e2df084f65628c90759c6886e9f1fc140 Mon Sep 17 00:00:00 2001 From: Jared Vu Date: Wed, 22 Nov 2023 14:08:03 -0800 Subject: [PATCH 1/2] Update Abacus@1.0.28 (#161) --- package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index b114bc8..aaf4322 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@cosmjs/proto-signing": "^0.31.0", "@cosmjs/stargate": "^0.31.0", "@cosmjs/tendermint-rpc": "^0.31.0", - "@dydxprotocol/v4-abacus": "^1.0.26", + "@dydxprotocol/v4-abacus": "^1.0.28", "@dydxprotocol/v4-client-js": "^1.0.0", "@dydxprotocol/v4-localization": "^1.0.6", "@ethersproject/providers": "^5.7.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4afd17b..df88ec8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + dependencies: '@0xsquid/sdk': specifier: ^1.10.0 @@ -23,8 +27,8 @@ dependencies: specifier: ^0.31.0 version: 0.31.0 '@dydxprotocol/v4-abacus': - specifier: ^1.0.26 - version: 1.0.26 + specifier: ^1.0.28 + version: 1.0.28 '@dydxprotocol/v4-client-js': specifier: ^1.0.0 version: 1.0.0 @@ -984,8 +988,8 @@ packages: resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==} dev: true - /@dydxprotocol/v4-abacus@1.0.26: - resolution: {integrity: sha512-WS3NEjkIVy9TM+I5BWKNbTrK3vhwx6AW8ow9fMl4+AiKnoLQmGa7c/4YErv/zFfoidHgeCVgACOtZqA8WrcS4w==} + /@dydxprotocol/v4-abacus@1.0.28: + resolution: {integrity: sha512-JIpGK6++ug9Mb24N+z6AjoZAntIva6Rgl3NxsJw1Ykk/RuvXTYigcDTeknemU6dUhlQ1EJrrsgmvwpqBwNbz5A==} dev: false /@dydxprotocol/v4-client-js@1.0.0: @@ -14136,7 +14140,3 @@ packages: /zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} dev: true - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false From 549ae558e7e83c1e569c9e1c4f16f16f7fdbb505 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 27 Nov 2023 08:57:57 -0800 Subject: [PATCH 2/2] Default Locale to EN if not supported (#163) --- src/state/localizationMiddleware.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/state/localizationMiddleware.ts b/src/state/localizationMiddleware.ts index 40049ff..db30e92 100644 --- a/src/state/localizationMiddleware.ts +++ b/src/state/localizationMiddleware.ts @@ -57,9 +57,8 @@ export default (store: any) => (next: any) => async (action: PayloadAction) } else if (globalThis.navigator?.language) { const browserLanguageBaseTag = globalThis.navigator.language.split('-')[0].toLowerCase(); - const locale = SUPPORTED_BASE_TAGS_LOCALE_MAPPING[ - browserLanguageBaseTag - ] as SupportedLocales; + const locale = (SUPPORTED_BASE_TAGS_LOCALE_MAPPING[browserLanguageBaseTag] ?? + SUPPORTED_BASE_TAGS_LOCALE_MAPPING[SupportedLocales.EN]) as SupportedLocales; if (locale) { store.dispatch(setSelectedLocale({ locale, isAutoDetect: true }));