Merge pull request #535 from pangolindex/dev - Production v7.3.10

Production v7.3.10

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pangolindex/components",
-  "version": "7.3.9",
+  "version": "7.3.10-rc.2",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
   "engines": {

src/components/Pools/DetailModal/Header/index.tsx

@@ -109,16 +109,6 @@ const Header: React.FC<Props> = ({ stakingInfo, onClose }) => {
             <RewardTokens rewardTokens={rewardTokens} size={24} />
           </Box>
         </Box>
-        {cheftType === ChefType.PANGO_CHEF && isStaking && (
-          <Stat
-            title={`${t('pool.yourAPR')}:`}
-            stat={`${numeral(userApr).format('0.00a')}%`}
-            titlePosition="top"
-            titleFontSize={14}
-            statFontSize={[24, 18]}
-            titleColor="text2"
-          />
-        )}
         <Stat
           title={`${t('pool.swapFeeAPR')}:`}
           stat={swapFeeApr && !stakingInfo?.isPeriodFinished ? `${numeral(swapFeeApr).format('0a')}%` : '-'}
@@ -143,6 +133,16 @@ const Header: React.FC<Props> = ({ stakingInfo, onClose }) => {
           statFontSize={[24, 18]}
           titleColor="text2"
         />
+        {cheftType === ChefType.PANGO_CHEF && isStaking && (
+          <Stat
+            title={`${t('pool.yourAPR')}:`}
+            stat={`${numeral(userApr).format('0.00a')}%`}
+            titlePosition="top"
+            titleFontSize={14}
+            statFontSize={[24, 18]}
+            titleColor="text2"
+          />
+        )}
         <Hidden upToSmall={true} upToMedium={true}>
           <CloseIcon onClick={onClose} color={theme.text3} />
         </Hidden>

src/constants/swap.ts

@@ -26,8 +26,8 @@ export const CUSTOM_BASES: { [chainId in ChainId]?: { [tokenAddress: string]: To
 
 export const SWAP_DEFAULT_CURRENCY = {
   [ChainId.AVALANCHE]: {
-    inputCurrency: 'AVAX',
-    outputCurrency: USDC[ChainId.AVALANCHE].address,
+    inputCurrency: USDC[ChainId.AVALANCHE].address,
+    outputCurrency: 'AVAX',
   },
   [ChainId.FUJI]: {
     inputCurrency: '',
@@ -47,11 +47,11 @@ export const SWAP_DEFAULT_CURRENCY = {
   },
   [ChainId.FLARE_MAINNET]: {
     inputCurrency: 'FLR',
-    outputCurrency: '',
+    outputCurrency: PNG[ChainId.FLARE_MAINNET].address,
   },
   [ChainId.HEDERA_TESTNET]: {
     inputCurrency: 'HBAR',
-    outputCurrency: WAVAX[ChainId.HEDERA_TESTNET].address,
+    outputCurrency: PNG[ChainId.HEDERA_TESTNET].address,
   },
   [ChainId.HEDERA_MAINNET]: {
     inputCurrency: 'HBAR',

src/i18n.ts

@@ -1,43 +1,15 @@
 import i18next from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
-import deTranslation from './locales/de.json';
 import enTranslation from './locales/en.json';
-import esTranslation from './locales/es.json';
-import frTranslation from './locales/fr.json';
-import ptBrTranslation from './locales/pt-br.json';
-import trTranslation from './locales/tr.json';
-import vnTranslation from './locales/vn.json';
-import zhTranslation from './locales/zh.json';
 
 const resources = {
   en: {
     translation: enTranslation,
   },
-  de: {
-    translation: deTranslation,
-  },
-  tr: {
-    translation: trTranslation,
-  },
-  zh: {
-    translation: zhTranslation,
-  },
-  es: {
-    translation: esTranslation,
-  },
-  fr: {
-    translation: frTranslation,
-  },
-  pt: {
-    translation: ptBrTranslation,
-  },
-  vn: {
-    translation: vnTranslation,
-  },
 };
 
-export const availableLanguages = ['en', 'de', 'tr', 'zh', 'es', 'fr', 'pt-br', 'vn'];
+export const availableLanguages = ['en'];
 export const defaultLocale = 'en';
 
 const determineLngFn = (code: string): string => {