fix: re-enable UniswapX after disabling (#7081 )

fix: allow gouda after user disables
ci: add global CODEOWNERS
2023-08-03 17:08:16 -07:00 · 2023-07-28 20:34:20 +00:00 · 2023-07-28 20:34:20 +00:00
35 changed files with 118705 additions and 2 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+@uniswap/web-admins
--- a/src/locales/af-ZA.po
+++ b/src/locales/af-ZA.po
--- a/src/locales/ar-SA.po
+++ b/src/locales/ar-SA.po
--- a/src/locales/ca-ES.po
+++ b/src/locales/ca-ES.po
--- a/src/locales/cs-CZ.po
+++ b/src/locales/cs-CZ.po
--- a/src/locales/da-DK.po
+++ b/src/locales/da-DK.po
--- a/src/locales/de-DE.po
+++ b/src/locales/de-DE.po
--- a/src/locales/el-GR.po
+++ b/src/locales/el-GR.po
--- a/src/locales/es-ES.po
+++ b/src/locales/es-ES.po
--- a/src/locales/fi-FI.po
+++ b/src/locales/fi-FI.po
--- a/src/locales/fr-FR.po
+++ b/src/locales/fr-FR.po
--- a/src/locales/he-IL.po
+++ b/src/locales/he-IL.po
--- a/src/locales/hu-HU.po
+++ b/src/locales/hu-HU.po
--- a/src/locales/id-ID.po
+++ b/src/locales/id-ID.po
--- a/src/locales/it-IT.po
+++ b/src/locales/it-IT.po
--- a/src/locales/ja-JP.po
+++ b/src/locales/ja-JP.po
--- a/src/locales/ko-KR.po
+++ b/src/locales/ko-KR.po
--- a/src/locales/nl-NL.po
+++ b/src/locales/nl-NL.po
--- a/src/locales/no-NO.po
+++ b/src/locales/no-NO.po
--- a/src/locales/pl-PL.po
+++ b/src/locales/pl-PL.po
--- a/src/locales/pt-BR.po
+++ b/src/locales/pt-BR.po
--- a/src/locales/pt-PT.po
+++ b/src/locales/pt-PT.po
--- a/src/locales/ro-RO.po
+++ b/src/locales/ro-RO.po
--- a/src/locales/ru-RU.po
+++ b/src/locales/ru-RU.po
--- a/src/locales/sl-SI.po
+++ b/src/locales/sl-SI.po
--- a/src/locales/sr-SP.po
+++ b/src/locales/sr-SP.po
--- a/src/locales/sv-SE.po
+++ b/src/locales/sv-SE.po
--- a/src/locales/sw-TZ.po
+++ b/src/locales/sw-TZ.po
--- a/src/locales/th-TH.po
+++ b/src/locales/th-TH.po
--- a/src/locales/tr-TR.po
+++ b/src/locales/tr-TR.po
--- a/src/locales/uk-UA.po
+++ b/src/locales/uk-UA.po
--- a/src/locales/vi-VN.po
+++ b/src/locales/vi-VN.po
--- a/src/locales/zh-CN.po
+++ b/src/locales/zh-CN.po
--- a/src/locales/zh-TW.po
+++ b/src/locales/zh-TW.po
--- a/src/state/routing/slice.ts
+++ b/src/state/routing/slice.ts
@ -65,7 +65,7 @@ const DEFAULT_QUERY_PARAMS = {
 }

 function getRoutingAPIConfig(args: GetQuoteArgs): RoutingConfig {
-  const { account, tradeType, tokenOutAddress, tokenInChainId, uniswapXForceSyntheticQuotes } = args
+  const { account, tradeType, tokenOutAddress, tokenInChainId, uniswapXForceSyntheticQuotes, routerPreference } = args

  const uniswapx = {
    useSyntheticQuotes: uniswapXForceSyntheticQuotes,
@ -87,7 +87,7 @@ function getRoutingAPIConfig(args: GetQuoteArgs): RoutingConfig {
  // so even if the user has selected UniswapX as their router preference, force them to receive a Classic quote.
  if (
    !args.uniswapXEnabled ||
-    args.userDisabledUniswapX ||
+    (args.userDisabledUniswapX && routerPreference !== RouterPreference.X) ||
    tokenOutIsNative ||
    tradeType === TradeType.EXACT_OUTPUT ||
    !isUniswapXSupportedChain(tokenInChainId)
Author	SHA1	Message	Date
eddie	c881636e74	fix: re-enable UniswapX after disabling (#7081 ) fix: allow gouda after user disables	2023-08-03 17:08:16 -07:00
UL Service Account	44791872ad	ci: add global CODEOWNERS	2023-07-28 20:34:20 +00:00
UL Service Account	6c212c442d	ci(t9n): download translations from crowdin	2023-07-28 20:34:20 +00:00