Merge pull request #1220 from crypto-com/dev

Feature: Merge Dev to Master
crypto-com · Aug 22, 2022 · eaee257 · eaee257
2 parents c76a569 + 2d7daa5
commit eaee257
Show file tree

Hide file tree

Showing 93 changed files with 140 additions and 37 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,23 @@
-* text eol=lf
+*.js text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.pdf binary
diff --git a/public/dapp_logos/005bXle3_400x400.png b/public/dapp_logos/005bXle3_400x400.png
diff --git a/public/dapp_logos/5E1nW_0q_400x400.png b/public/dapp_logos/5E1nW_0q_400x400.png
diff --git a/public/dapp_logos/ATYOILyW_400x400.png b/public/dapp_logos/ATYOILyW_400x400.png
diff --git a/public/dapp_logos/Argo_Finance.png b/public/dapp_logos/Argo_Finance.png
diff --git a/public/dapp_logos/Boomer_Squad.png b/public/dapp_logos/Boomer_Squad.png
diff --git a/public/dapp_logos/Cougar_Optimizer.png b/public/dapp_logos/Cougar_Optimizer.png
diff --git a/public/dapp_logos/DexPad.png b/public/dapp_logos/DexPad.png
diff --git a/public/dapp_logos/Ferro_Protocol.png b/public/dapp_logos/Ferro_Protocol.png
diff --git a/public/dapp_logos/MarbleVerse.png b/public/dapp_logos/MarbleVerse.png
diff --git a/public/dapp_logos/OzhB0zBV_400x400.png b/public/dapp_logos/OzhB0zBV_400x400.png
diff --git a/public/dapp_logos/PegasusDollar.png b/public/dapp_logos/PegasusDollar.png
diff --git a/public/dapp_logos/TofuNFT.png b/public/dapp_logos/TofuNFT.png
diff --git a/public/dapp_logos/VNkWg0qu_400x400.png b/public/dapp_logos/VNkWg0qu_400x400.png
diff --git a/public/dapp_logos/VersaGames.png b/public/dapp_logos/VersaGames.png
diff --git a/public/dapp_logos/Xc1TIhyS_400x400.png b/public/dapp_logos/Xc1TIhyS_400x400.png
diff --git a/public/dapp_logos/XcdQvwmw_400x400.png b/public/dapp_logos/XcdQvwmw_400x400.png
diff --git a/public/dapp_logos/adamant-finance.png b/public/dapp_logos/adamant-finance.png
diff --git a/public/dapp_logos/agile-finance.png b/public/dapp_logos/agile-finance.png
diff --git a/public/dapp_logos/annex.jpg b/public/dapp_logos/annex.jpg
diff --git a/public/dapp_logos/autofarm.png b/public/dapp_logos/autofarm.png
diff --git a/public/dapp_logos/bHEK4pyP_400x400.png b/public/dapp_logos/bHEK4pyP_400x400.png
diff --git a/public/dapp_logos/bankswap.png b/public/dapp_logos/bankswap.png
diff --git a/public/dapp_logos/beefy-finance.png b/public/dapp_logos/beefy-finance.png
diff --git a/public/dapp_logos/blackbird-finance.png b/public/dapp_logos/blackbird-finance.png
diff --git a/public/dapp_logos/bushicro-logo.png b/public/dapp_logos/bushicro-logo.png
diff --git a/public/dapp_logos/chronoswap.jpg b/public/dapp_logos/chronoswap.jpg
diff --git a/public/dapp_logos/cougar-exchange.png b/public/dapp_logos/cougar-exchange.png
diff --git a/public/dapp_logos/cougarswap.png b/public/dapp_logos/cougarswap.png
diff --git a/public/dapp_logos/croblanc.jpg b/public/dapp_logos/croblanc.jpg
diff --git a/public/dapp_logos/crodex.jpg b/public/dapp_logos/crodex.jpg
diff --git a/public/dapp_logos/croissant-games.png b/public/dapp_logos/croissant-games.png
diff --git a/public/dapp_logos/cronaswap.png b/public/dapp_logos/cronaswap.png
diff --git a/public/dapp_logos/cronofi-finance.png b/public/dapp_logos/cronofi-finance.png
diff --git a/public/dapp_logos/cronos-ragdolls-logo.png b/public/dapp_logos/cronos-ragdolls-logo.png
diff --git a/public/dapp_logos/cronosbay.png b/public/dapp_logos/cronosbay.png
diff --git a/public/dapp_logos/cronossociety-logo.png b/public/dapp_logos/cronossociety-logo.png
diff --git a/public/dapp_logos/crosea-logo.png b/public/dapp_logos/crosea-logo.png
diff --git a/public/dapp_logos/croskull.png b/public/dapp_logos/croskull.png
diff --git a/public/dapp_logos/crowfi.jpg b/public/dapp_logos/crowfi.jpg
diff --git a/public/dapp_logos/crystl-finance.png b/public/dapp_logos/crystl-finance.png
diff --git a/public/dapp_logos/cyber-dog.png b/public/dapp_logos/cyber-dog.png
diff --git a/public/dapp_logos/darkcrypto.svg b/public/dapp_logos/darkcrypto.svg
diff --git a/public/dapp_logos/dna-dollar.jpg b/public/dapp_logos/dna-dollar.jpg
diff --git a/public/dapp_logos/duckydefi.png b/public/dapp_logos/duckydefi.png
diff --git a/public/dapp_logos/ebisus-bay.png b/public/dapp_logos/ebisus-bay.png
diff --git a/public/dapp_logos/elk.jpg b/public/dapp_logos/elk.jpg
diff --git a/public/dapp_logos/empire-dex.jpg b/public/dapp_logos/empire-dex.jpg
diff --git a/public/dapp_logos/fortune-dao.png b/public/dapp_logos/fortune-dao.png
diff --git a/public/dapp_logos/galatea-cash.jpg b/public/dapp_logos/galatea-cash.jpg
diff --git a/public/dapp_logos/genesis-finance.png b/public/dapp_logos/genesis-finance.png
diff --git a/public/dapp_logos/kafefinance.png b/public/dapp_logos/kafefinance.png
diff --git a/public/dapp_logos/kryptodex.jpg b/public/dapp_logos/kryptodex.jpg
diff --git a/public/dapp_logos/kyberswap.png b/public/dapp_logos/kyberswap.png
diff --git a/public/dapp_logos/liquidus.png b/public/dapp_logos/liquidus.png
diff --git a/public/dapp_logos/lootpad.png b/public/dapp_logos/lootpad.png
diff --git a/public/dapp_logos/metacrono.png b/public/dapp_logos/metacrono.png
diff --git a/public/dapp_logos/metaverse-pixels-logo.png b/public/dapp_logos/metaverse-pixels-logo.png
diff --git a/public/dapp_logos/metf-finance.png b/public/dapp_logos/metf-finance.png
diff --git a/public/dapp_logos/mimas-finance.png b/public/dapp_logos/mimas-finance.png
diff --git a/public/dapp_logos/minotaur-money.png b/public/dapp_logos/minotaur-money.png
diff --git a/public/dapp_logos/minted.png b/public/dapp_logos/minted.png
diff --git a/public/dapp_logos/mm-finance.jpg b/public/dapp_logos/mm-finance.jpg
diff --git a/public/dapp_logos/mmf-money.png b/public/dapp_logos/mmf-money.png
diff --git a/public/dapp_logos/mmo-finance.png b/public/dapp_logos/mmo-finance.png
diff --git a/public/dapp_logos/panels-project-logo.png b/public/dapp_logos/panels-project-logo.png
diff --git a/public/dapp_logos/photonswap-finance.jpg b/public/dapp_logos/photonswap-finance.jpg
diff --git a/public/dapp_logos/pickle.svg b/public/dapp_logos/pickle.svg
diff --git a/public/dapp_logos/reckless-robots-logo.png b/public/dapp_logos/reckless-robots-logo.png
diff --git a/public/dapp_logos/salem-finance.png b/public/dapp_logos/salem-finance.png
diff --git a/public/dapp_logos/savannah-finance.png b/public/dapp_logos/savannah-finance.png
diff --git a/public/dapp_logos/shield_logo.png b/public/dapp_logos/shield_logo.png
diff --git a/public/dapp_logos/single-finance-logo.png b/public/dapp_logos/single-finance-logo.png
diff --git a/public/dapp_logos/smolswap.jpg b/public/dapp_logos/smolswap.jpg
diff --git a/public/dapp_logos/stormswap.png b/public/dapp_logos/stormswap.png
diff --git a/public/dapp_logos/swapp.jpg b/public/dapp_logos/swapp.jpg
diff --git a/public/dapp_logos/tectonic.png b/public/dapp_logos/tectonic.png
diff --git a/public/dapp_logos/the-crobees-logo.png b/public/dapp_logos/the-crobees-logo.png
diff --git a/public/dapp_logos/the-gas-station-logo.png b/public/dapp_logos/the-gas-station-logo.png
diff --git a/public/dapp_logos/vjQcypIM_400x400.png b/public/dapp_logos/vjQcypIM_400x400.png
diff --git a/public/dapp_logos/vultureswap.jpg b/public/dapp_logos/vultureswap.jpg
diff --git a/public/dapp_logos/vvs-finance.jpg b/public/dapp_logos/vvs-finance.jpg
diff --git a/public/dapp_logos/yieldwolf.jpg b/public/dapp_logos/yieldwolf.jpg
diff --git a/public/dapp_logos/zeus-finance.png b/public/dapp_logos/zeus-finance.png
diff --git a/src/config/StaticAssets.ts b/src/config/StaticAssets.ts
@@ -1,9 +1,11 @@
 // Every created wallet get initialized with a new CRO asset
 import { getRandomId } from '../crypto/RandomGen';
-import { AssetCreationType, UserAssetConfig, UserAssetType } from '../models/UserAsset';
+import { AssetCreationType, UserAsset, UserAssetConfig, UserAssetType } from '../models/UserAsset';
 import { WalletConfig, SupportedChainName } from './StaticConfig';
 import { checkIfTestnet } from '../utils/utils';
 import { ICON_ATOM_TENDERMINT, ICON_CRO_EVM, ICON_CRO_TENDERMINT, ICON_ETH_EVM } from '../components/AssetIcon';
+import { Session } from '../models/Session';
+import { TestNetCroeseid4Config, MainNetConfig } from './StaticConfig';
 
 // This will be used later for asset recreation/migration
 export const STATIC_ASSET_COUNT = 4;
@@ -55,17 +57,20 @@ export const MainNetEvmConfig: UserAssetConfig = {
 // Every created wallet get initialized with a new CRO asset
 export const CRONOS_TENDERMINT_ASSET = (walletConfig: WalletConfig) => {
   const { network } = walletConfig;
-  const assetSymbol = network.coin.croDenom.toString().toUpperCase();
+  const isTestnet = checkIfTestnet(network);
 
   const config: UserAssetConfig = {
-    explorerUrl: walletConfig.explorerUrl,
-    explorer: walletConfig.explorer,
-    chainId: network.chainId,
-    fee: { gasLimit: '300000', networkFee: '10000' },
-    indexingUrl: walletConfig.indexingUrl,
+    explorerUrl: isTestnet ? TestNetCroeseid4Config.explorerUrl : MainNetConfig.explorerUrl,
+    explorer: isTestnet ? TestNetCroeseid4Config.explorer : MainNetConfig.explorer,
+    chainId: isTestnet ? TestNetCroeseid4Config.network.chainId : MainNetConfig.network.chainId,
+    fee: { 
+      gasLimit: isTestnet ? TestNetCroeseid4Config.fee.gasLimit : MainNetConfig.fee.gasLimit,
+      networkFee: isTestnet ? TestNetCroeseid4Config.fee.networkFee : MainNetConfig.fee.networkFee,
+    },
+    indexingUrl: isTestnet ? TestNetCroeseid4Config.indexingUrl : MainNetConfig.indexingUrl,
     isLedgerSupportDisabled: true,
     isStakingDisabled: true,
-    nodeUrl: network.defaultNodeUrl,
+    nodeUrl: isTestnet ? TestNetCroeseid4Config.nodeUrl : MainNetConfig.nodeUrl,
     memoSupportDisabled: false,
   };
 
@@ -76,7 +81,7 @@ export const CRONOS_TENDERMINT_ASSET = (walletConfig: WalletConfig) => {
     icon_url: ICON_CRO_TENDERMINT,
     identifier: getRandomId(),
     name: SupportedChainName.CRYPTO_ORG,
-    symbol: assetSymbol,
+    symbol: isTestnet ? TestNetCroeseid4Config.network.coin.croDenom.toString().toUpperCase() : MainNetConfig.network.coin.croDenom.toString().toUpperCase(),
     mainnetSymbol: 'CRO', // This is to be used solely for markets data since testnet market prices is always non existent
     stakedBalance: '0',
     unbondingBalance: '0',
@@ -235,3 +240,22 @@ export const ETH_ASSET = (walletConfig: WalletConfig) => {
     config,
   };
 };
+
+export const getDefaultUserAssetConfig = (asset: UserAsset | undefined, session: Session) => {
+  if(!asset) return;
+  const { assetType, name } = asset;
+  const { config } = session.wallet; 
+
+  switch (`${assetType}-${name}`) {
+    case `${UserAssetType.TENDERMINT}-${SupportedChainName.COSMOS_HUB}`:
+      return ATOM_TENDERMINT_ASSET(config);
+    case `${UserAssetType.TENDERMINT}-${SupportedChainName.CRYPTO_ORG}`:
+      return CRONOS_TENDERMINT_ASSET(config);
+    case `${UserAssetType.EVM}-${SupportedChainName.CRONOS}`:
+      return CRONOS_EVM_ASSET(config);
+    case `${UserAssetType.EVM}-${SupportedChainName.ETHEREUM}`:
+      return ETH_ASSET(config);
+    default:
+      return null;
+  }
+};
diff --git a/src/config/StaticConfig.ts b/src/config/StaticConfig.ts
@@ -364,7 +364,7 @@ const TestnetCroeseid4: Network = {
   rpcUrl: 'https://testnet-croeseid-4.crypto.org:26657',
 };
 
-const TestNetCroeseid4Config: WalletConfig = {
+export const TestNetCroeseid4Config: WalletConfig = {
   enabled: true,
   name: NetworkName.TESTNET,
   derivationPath: 'm/44\'/1\'/0\'/0/0',
@@ -387,7 +387,7 @@ const TestNetCroeseid4Config: WalletConfig = {
   },
 };
 
-const MainNetConfig: WalletConfig = {
+export const MainNetConfig: WalletConfig = {
   enabled: true,
   name: NetworkName.MAINNET,
   derivationPath: 'm/44\'/394\'/0\'/0/0',

diff --git a/src/pages/dapp/assets/Ferro_Protocol.png b/src/pages/dapp/assets/Ferro_Protocol.png
diff --git a/src/pages/dapp/assets/ferro.png b/src/pages/dapp/assets/ferro.png
diff --git a/src/pages/dapp/assets/projects.ts b/src/pages/dapp/assets/projects.ts
@@ -725,6 +725,14 @@ const NFTProjects: CronosProject[] = [
     link: 'https://cronossociety.com/',
     twitter: 'https://twitter.com/CronosSociety',
   },
+  {
+    name: 'Minted',
+    category: ['NFT'],
+    description: 'Get rewarded for trading NFTs',
+    logo: 'minted.png',
+    link: 'https://minted.network/',
+    twitter: '', 
+  }
 ];
 
 export const projects = [...defillamaProjects, ...unListedProjects, ...NFTProjects];
diff --git a/src/pages/dapp/dapp.tsx b/src/pages/dapp/dapp.tsx
@@ -9,7 +9,7 @@ import { Dapp } from './types';
 import BorderlessCard from './components/BorderlessCard/BorderlessCard';
 import logoVvs from './assets/vvs.svg';
 import logoTectonic from './assets/tectonic.svg';
-import logoFerroProtocol from './assets/Ferro_Protocol.png';
+import logoFerroProtocol from './assets/ferro.png';
 
 import AddressBar from './components/AddressBar/AddressBar';
 import SavedTab from './components/Tabs/SavedTab';
@@ -26,6 +26,14 @@ const { Header, Content } = Layout;
 const { TabPane } = Tabs;
 
 const DappList: Dapp[] = [
+  {
+    name: 'Minted',
+    logo: '/dapp_logos/minted.png',
+    alt: '',
+    description:
+      'Get rewarded for trading NFTs.',
+    url: 'https://minted.network/',
+  },
   {
     name: 'Ferro Protocol',
     logo: logoFerroProtocol,

diff --git a/src/pages/settings/components/FormSettings.tsx b/src/pages/settings/components/FormSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Route, useHistory, Switch as RouterSwitch } from 'react-router-dom';
 import '../settings.less';
 import 'antd/dist/antd.css';
@@ -21,6 +21,7 @@ import { GeneralSettingsForm } from './GeneralSettingsForm';
 import { MetaInfoComponent } from './MetaInfoComponent';
 import { getAssetConfigFromWalletConfig } from '../utils';
 import Support from '../tabs/Support/Support';
+import { getDefaultUserAssetConfig } from '../../../config/StaticAssets';
 
 const { ipcRenderer } = window.require('electron');
 
@@ -43,8 +44,10 @@ export const FormSettings = () => {
   const [session, setSession] = useRecoilState(sessionState);
   const [walletAllAssets, setWalletAllAssets] = useRecoilState(walletAllAssetsState);
   const [currentAssetIdentifier, setCurrentAssetIdentifier] = useState<string>();
+
+  const didMountRef = useRef(false);
 
-  const defaultSettings: UserAssetConfig =
+  const prevSettings: UserAssetConfig =
     session.activeAsset?.config || getAssetConfigFromWalletConfig(session.wallet.config);
 
   const history = useHistory();
@@ -59,35 +62,44 @@ export const FormSettings = () => {
   useEffect(() => {
     const croAsset = getCronosTendermintAsset(walletAllAssets);
 
-    if (defaultSettings.fee !== undefined) {
-      networkFee = defaultSettings.fee.networkFee;
+    if (prevSettings.fee !== undefined) {
+      networkFee = prevSettings.fee.networkFee;
     }
-    if (defaultSettings.fee !== undefined) {
-      gasLimit = defaultSettings.fee.gasLimit;
+    if (prevSettings.fee !== undefined) {
+      gasLimit = prevSettings.fee.gasLimit;
     }
 
     form.setFieldsValue({
-      nodeUrl: defaultSettings.nodeUrl,
-      chainId: defaultSettings.chainId,
-      indexingUrl: defaultSettings.indexingUrl,
+      nodeUrl: prevSettings.nodeUrl,
+      chainId: prevSettings.chainId,
+      indexingUrl: prevSettings.indexingUrl,
       networkFee,
       gasLimit,
     });
     if (!currentAssetIdentifier && croAsset) {
       setCurrentAssetIdentifier(croAsset?.identifier);
+
+    }
+    if (!didMountRef.current && croAsset) {
+      didMountRef.current = true;
+      setSession({
+        ...session,
+        activeAsset: croAsset,
+      });
+      return;
     }
-  }, [form, defaultSettings, walletAllAssets, setSession]);
+  }, [form, prevSettings, walletAllAssets, session, setSession]);
 
   const onFinish = async values => {
     const defaultGasLimit =
-      defaultSettings.fee !== undefined ? defaultSettings.fee.gasLimit : FIXED_DEFAULT_GAS_LIMIT;
+      prevSettings.fee !== undefined ? prevSettings.fee.gasLimit : FIXED_DEFAULT_GAS_LIMIT;
     const defaultNetworkFee =
-      defaultSettings.fee !== undefined ? defaultSettings.fee.networkFee : FIXED_DEFAULT_FEE;
+      prevSettings.fee !== undefined ? prevSettings.fee.networkFee : FIXED_DEFAULT_FEE;
 
     if (
-      defaultSettings.nodeUrl === values.nodeUrl &&
-      defaultSettings.indexingUrl === values.indexingUrl &&
-      defaultSettings.chainId === values.chainId &&
+      prevSettings.nodeUrl === values.nodeUrl &&
+      prevSettings.indexingUrl === values.indexingUrl &&
+      prevSettings.chainId === values.chainId &&
       defaultGasLimit === values.gasLimit &&
       defaultNetworkFee === values.networkFee
     ) {
@@ -155,15 +167,26 @@ export const FormSettings = () => {
     );
   };
 
-  const onRestoreDefaults = () => {
+  const onRestorePrevSettings = () => {
     form.setFieldsValue({
-      nodeUrl: defaultSettings.nodeUrl,
-      chainId: defaultSettings.chainId,
-      indexingUrl: defaultSettings.indexingUrl,
+      nodeUrl: prevSettings.nodeUrl,
+      chainId: prevSettings.chainId,
+      indexingUrl: prevSettings.indexingUrl,
       networkFee:
-        defaultSettings.fee && defaultSettings.fee.networkFee ? defaultSettings.fee.networkFee : '',
+        prevSettings.fee && prevSettings.fee.networkFee ? prevSettings.fee.networkFee : '',
       gasLimit:
-        defaultSettings.fee && defaultSettings.fee.gasLimit ? defaultSettings.fee.gasLimit : '',
+        prevSettings.fee && prevSettings.fee.gasLimit ? prevSettings.fee.gasLimit : '',
+    });
+  };
+
+  const onDefaultSettings = () => {
+    const defaultAssetConfig = getDefaultUserAssetConfig(session.activeAsset!, session);
+    form.setFieldsValue({
+      nodeUrl: defaultAssetConfig?.config.nodeUrl,
+      chainId: defaultAssetConfig?.config.chainId,
+      indexingUrl: defaultAssetConfig?.config.indexingUrl,
+      networkFee: defaultAssetConfig?.config.fee.networkFee,
+      gasLimit: defaultAssetConfig?.config.fee.gasLimit,
     });
   };
 
@@ -216,9 +239,12 @@ export const FormSettings = () => {
                         <Button type="primary" htmlType="submit" loading={isButtonLoading}>
                           {t('general.save')}
                         </Button>
-                        <Button type="link" htmlType="button" onClick={onRestoreDefaults}>
+                        <Button type="link" htmlType="button" onClick={onRestorePrevSettings}>
                           {t('general.discard')}
                         </Button>
+                        <Button type="link" htmlType="button" onClick={onDefaultSettings} style={{ color: '#20bca4' }}>
+                          {t('general.default')}
+                        </Button>
                       </Form.Item>
                     </div>
                   </div>

diff --git a/src/pages/settings/components/GeneralSettingsForm.tsx b/src/pages/settings/components/GeneralSettingsForm.tsx
@@ -12,6 +12,7 @@ import { EnableGeneralSettingsPropagation } from '../../../models/Wallet';
 import { AnalyticsService } from '../../../service/analytics/AnalyticsService';
 import { getChainName } from '../../../utils/utils';
 import { AssetIcon } from '../../../components/AssetIcon';
+import { UserAssetType } from '../../../models/UserAsset';
 
 const { Option } = Select;
 
@@ -31,7 +32,17 @@ export const GeneralSettingsForm = props => {
   const configurableAssets = useMemo(() => {
     return walletAllAssets.filter(asset => {
       return _.size(asset.contractAddress) < 1;
-    });
+    })
+      // Prioritize CRO assets over other assets
+      .sort((a, b) => {
+        if(a.mainnetSymbol === 'CRO') {
+          if(b.mainnetSymbol === 'CRO' && b.assetType === UserAssetType.TENDERMINT) {
+            return 1;
+          }
+          return -1;
+        }
+        return 1;
+      });
   }, [walletAllAssets]);
 
   const onSwitchAsset = value => {

diff --git a/src/pages/settings/settings.less b/src/pages/settings/settings.less
@@ -1,7 +1,11 @@
 .settings-content {
   padding: 24px;
   .container {
-    max-width: 500px;
+    max-width: 600px;
+    // width: 500px;
+    // .ant-row.ant-form-item.button {
+    //    width: 600px;
+    // }
     .item {
       margin-bottom: 20px;
     }