chore: merge main into explore (#4281)

merge main into explore

Author: vm

.env

@@ -1,3 +1,2 @@
 REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
 REACT_APP_FORTMATIC_KEY="pk_live_357F77728B8EB880"
-REACT_APP_LOCALES="locales"

.nvmrc

@@ -1 +1 @@
-lts/*
+14

babel-plugin-macros.config.js

@@ -1,4 +1,4 @@
-const isDev = process.env.NODE_ENV !== 'production'
+const isDev = process.env.NODE_ENV === 'development'
 
 module.exports = {
   styledComponents: {

src/components/Header/index.tsx

@@ -3,7 +3,7 @@ import useScrollPosition from '@react-hook/window-scroll'
 import { useWeb3React } from '@web3-react/core'
 import { getChainInfoOrDefault } from 'constants/chainInfo'
 import { SupportedChainId } from 'constants/chains'
-import { Phase0Variant, usePhase0Flag } from 'featureFlag'
+import { Phase0Variant, usePhase0Flag } from 'featureFlags/flags/phase0'
 import useTheme from 'hooks/useTheme'
 import { darken } from 'polished'
 import { NavLink, useLocation } from 'react-router-dom'

src/featureFlags/flags/phase0.ts

@@ -0,0 +1,7 @@
+import { BaseVariant, useBaseFlag } from '../index'
+
+export function usePhase0Flag(): BaseVariant {
+  return useBaseFlag('phase0')
+}
+
+export { BaseVariant as Phase0Variant }

src/featureFlag/index.tsx renamed to src/featureFlags/index.tsx

@@ -34,34 +34,17 @@ export function useFeatureFlagsIsLoaded(): boolean {
   return useFeatureFlagsContext().isLoaded
 }
 
-// feature flag hooks
-
-export enum Phase0Variant {
-  Control = 'Control',
-  Enabled = 'Enabled',
-}
-
-export function usePhase0Flag(): Phase0Variant {
-  switch (useFeatureFlagsContext().flags['phase0']) {
-    case 'enabled':
-      return Phase0Variant.Enabled
-    case 'control':
-    default:
-      return Phase0Variant.Control
-  }
-}
-
-enum Phase1Variant {
+export enum BaseVariant {
   Control = 'Control',
   Enabled = 'Enabled',
 }
 
-export function usePhase1Flag(): Phase1Variant {
-  switch (useFeatureFlagsContext().flags['phase1']) {
+export function useBaseFlag(flag: string): BaseVariant {
+  switch (useFeatureFlagsContext().flags[flag]) {
     case 'enabled':
-      return Phase1Variant.Enabled
+      return BaseVariant.Enabled
     case 'control':
     default:
-      return Phase1Variant.Control
+      return BaseVariant.Control
   }
 }

src/index.tsx

@@ -3,7 +3,7 @@ import 'inter-ui'
 import 'polyfills'
 import 'components/analytics'
 
-import { FeatureFlagsProvider } from 'featureFlag'
+import { FeatureFlagsProvider } from 'featureFlags'
 import { BlockNumberProvider } from 'lib/hooks/useBlockNumber'
 import { MulticallUpdater } from 'lib/state/multicall'
 import { StrictMode } from 'react'

src/lib/i18n.tsx

@@ -79,7 +79,7 @@ const plurals: LocalePlural = {
 export async function dynamicActivate(locale: SupportedLocale) {
   i18n.loadLocaleData(locale, { plurals: () => plurals[locale] })
   try {
-    const catalog = await import(`${process.env.REACT_APP_LOCALES}/${locale}.js`)
+    const catalog = await import(`locales/${locale}.js`)
     // Bundlers will either export it as default or as a named export named default.
     i18n.load(locale, catalog.messages || catalog.default.messages)
   } catch {}

src/locales/af-ZA.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: uniswap-interface\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-21 14:04\n"
+"PO-Revision-Date: 2022-07-29 20:04\n"
 "Last-Translator: \n"
 "Language: af_ZA\n"
 "Language-Team: Afrikaans\n"
@@ -116,6 +116,10 @@ msgstr "<0> 🎉</0> Welkom by die Unicorn span :) <1> 🎉</1>"
 msgid "A minimum threshold of 0.25% of the total UNI supply is required to submit proposals"
 msgstr "'N Minimum drempel van 0,25% van die totale UNI-aanbod is nodig om voorstelle in te dien"
 
+#: src/components/swap/PriceImpactWarning.tsx
+msgid "A swap of this size may have a high price impact, given the current liquidity in the pool. There may be a large difference between the amount of your input token and what you will receive in the output token"
+msgstr "'n Ruil van hierdie grootte kan 'n hoë prysimpak hê, gegewe die huidige likiditeit in die swembad. Daar kan 'n groot verskil wees tussen die hoeveelheid van jou invoertoken en wat jy in die uitvoertoken sal ontvang"
+
 #: src/components/Menu/index.tsx
 msgid "About"
 msgstr "Oor"
@@ -1328,6 +1332,10 @@ msgstr "Prysimpak te hoog"
 msgid "Price Updated"
 msgstr "Prys opgedateer"
 
+#: src/components/swap/PriceImpactWarning.tsx
+msgid "Price impact warning"
+msgstr "Prys impak waarskuwing"
+
 #: src/pages/Pool/PositionPage.tsx
 msgid "Price range"
 msgstr "Prysklas"

src/locales/ar-SA.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: uniswap-interface\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-07-21 14:04\n"
+"PO-Revision-Date: 2022-07-29 20:04\n"
 "Last-Translator: \n"
 "Language: ar_SA\n"
 "Language-Team: Arabic\n"
@@ -116,6 +116,10 @@ msgstr "<0>🎉 </0>مرحبًا بكم في فريق:) <1>🎉</1>"
 msgid "A minimum threshold of 0.25% of the total UNI supply is required to submit proposals"
 msgstr "مطلوب حد أدنى قدره 0.25٪ من إجمالي إمداد UNI لتقديم العروض"
 
+#: src/components/swap/PriceImpactWarning.tsx
+msgid "A swap of this size may have a high price impact, given the current liquidity in the pool. There may be a large difference between the amount of your input token and what you will receive in the output token"
+msgstr "قد يكون لمقايضة بهذا الحجم تأثير كبير على السعر ، بالنظر إلى السيولة الحالية في المجمع. قد يكون هناك اختلاف كبير بين مقدار رمز الإدخال الخاص بك وما ستحصل عليه في رمز الإخراج"
+
 #: src/components/Menu/index.tsx
 msgid "About"
 msgstr "حول"
@@ -1328,6 +1332,10 @@ msgstr "تأثير السعر مرتفع للغاية"
 msgid "Price Updated"
 msgstr "تم تحديث السعر"
 
+#: src/components/swap/PriceImpactWarning.tsx
+msgid "Price impact warning"
+msgstr "تحذير من تأثير السعر"
+
 #: src/pages/Pool/PositionPage.tsx
 msgid "Price range"
 msgstr "نطاق السعر"