Merge pull request #109 from skalenetwork/beta

New stable version
skalenetwork · Aug 16, 2023 · 6736d16 · 6736d16 · vercel · Aug 16, 2023
2 parents f73ce13 + c715726
commit 6736d16
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 31 deletions.
diff --git a/env/mainnet/chainsData.json b/env/mainnet/chainsData.json
@@ -190,6 +190,21 @@
               "tokenKeyname": "_SKL_0xD162bB5c75FE99144295b03510bAb2DF99617440",
               "tokenType": "erc20"
             }
+          },
+          "usdc": {
+            "keyname": "_USDC_0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "recommendedValues": [
+              "50",
+              "100",
+              "200",
+              "500"
+            ],
+            "address": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+            "route": {
+              "hub": "elated-tan-skat",
+              "tokenKeyname": "_USDC_0x1c566a47e1baC535Ca616373146e3BE024F88Aa4",
+              "tokenType": "erc20"
+            }
           }
         }
       },
@@ -387,6 +402,16 @@
               "5000"
             ],
             "address": "0xE0595a049d02b7674572b0d59cd4880Db60EDC50"
+          },
+          "usdc": {
+            "keyname": "_USDC_0x1c566a47e1baC535Ca616373146e3BE024F88Aa4",
+            "recommendedValues": [
+              "50",
+              "100",
+              "200",
+              "500"
+            ],
+            "address": "0x5F795bb52dAC3085f578f4877D450e2929D2F13d"
           }
         }
       },
@@ -635,6 +660,16 @@
               "5000"
             ],
             "address": "0x7F73B66d4e6e67bCdeaF277b9962addcDabBFC4d"
+          },
+          "usdc": {
+            "keyname": "_USDC_0x1c566a47e1baC535Ca616373146e3BE024F88Aa4",
+            "recommendedValues": [
+              "50",
+              "100",
+              "200",
+              "500"
+            ],
+            "address": "0xCC205196288B7A26f6D43bBD68AaA98dde97276d"
           }
         }
       },
@@ -654,6 +689,21 @@
               "tokenKeyname": "_SKL_0x00c83aeCC790e8a4453e5dD3B0B4b3680501a7A7",
               "tokenType": "erc20"
             }
+          },
+          "usdc": {
+            "keyname": "_USDC_0x1c566a47e1baC535Ca616373146e3BE024F88Aa4",
+            "recommendedValues": [
+              "50",
+              "100",
+              "200",
+              "500"
+            ],
+            "address": "0xCC205196288B7A26f6D43bBD68AaA98dde97276d",
+            "route": {
+              "hub": "elated-tan-skat",
+              "tokenKeyname": "_USDC_0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+              "tokenType": "erc20"
+            }
           }
         }
       }

diff --git a/env/regression/chainsData.json b/env/regression/chainsData.json
@@ -0,0 +1,38 @@
+{
+  "mainnet": {
+    "hub": "ethereum",
+    "chains": {
+      "curly-red-alterf": {
+        "tokens": {
+          "eth": {
+            "keyname": "eth",
+            "recommendedValues": [
+              "0.01",
+              "0.1",
+              "0.2",
+              "0.5"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "curly-red-alterf": {
+    "chains": {
+      "mainnet": {
+        "tokens": {
+          "eth": {
+            "keyname": "eth",
+            "recommendedValues": [
+              "0.01",
+              "0.1",
+              "0.2",
+              "0.5"
+            ],
+            "address": "0xD2Aaa00700000000000000000000000000000000"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/env/regression/faucet.json b/env/regression/faucet.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/env/regression/metaportConfig.json b/env/regression/metaportConfig.json
@@ -0,0 +1,32 @@
+{
+  "skaleNetwork": "regression",
+  "autoLookup": false,
+  "openOnLoad": false,
+  "openButton": true,
+  "debug": false,
+  "chains": [
+    "mainnet",
+    "curly-red-alterf"
+  ],
+  "chainsMetadata": {
+  },
+  "tokens": {
+    "mainnet": {
+      "eth": {
+        "chains": [
+          ""
+        ]
+      },
+      "erc20": {
+      },
+      "erc721meta": {
+      },
+      "erc1155": {
+      }
+    }
+
+  },
+  "theme": {
+    "mode": "dark"
+  }
+}
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "@mui/lab": "^5.0.0-alpha.120",
     "@mui/material": "^5.11.4",
     "@skalenetwork/ima-js": "1.1.2-develop.3",
-    "@skalenetwork/metaport": "1.2.0",
+    "@skalenetwork/metaport": "1.2.0-develop.21",
     "@skaleproject/pow-ethers": "0.2.4",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",

diff --git a/skale-network b/skale-network
diff --git a/src/App.scss b/src/App.scss
@@ -1212,11 +1212,16 @@ body::-webkit-scrollbar {
   z-index: 2;
 }
 
-// .br__tileTop {
-//   position: absolute;
-//   top: 0;
-//   right: 0;
-//   z-index: 2;
-
-//   padding: 12pt 15pt;
-// }
+
+.br__chipXs {
+  height: 22px !important;
+
+  .MuiChip-label {
+    font-size: 0.7125rem;
+  }
+}
+
+.br__chipGray {
+  color: white !important;
+  background-color: #191919 !important;
+}
diff --git a/src/Header.js b/src/Header.js
@@ -22,9 +22,10 @@
 */
 
 import React from 'react';
-import Fab from '@mui/material/Fab';
 import AppBar from '@mui/material/AppBar';
 import Toolbar from '@mui/material/Toolbar';
+import Chip from '@mui/material/Chip';
+
 import { Link } from "react-router-dom";
 
 import logo from './skale_lg.svg';
@@ -33,17 +34,35 @@ import HelpZen from './components/HelpZen';
 import MoreMenu from './components/MoreMenu';
 import AccountMenu from './components/AccountMenu';
 
+import { METAPORT_CONFIG, MAINNET_CHAIN_NAME } from './core/constants';
+
 
 export default class Header extends React.Component {
   render() {
     return (
-      <AppBar elevation={0} position="fixed" className="sk-header" sx={{ zIndex: (theme) => theme.zIndex.drawer + 1 }}>
+      <AppBar
+        elevation={0}
+        position="fixed"
+        className="sk-header"
+        sx={{ zIndex: (theme) => theme.zIndex.drawer + 1 }}
+      >
         <Toolbar className='mp__flex'>
-          <div className="mp__flex mp__flexCenteredVert mp__flexGrow">
+          <div className="mp__flex mp__flexCenteredVert">
             <Link to="/" className='mp__undec mp__logoLink mp__flex mp__flexCenteredVert'>
               <img src={logo} className="logo" alt="logo" />
             </Link>
           </div>
+          <div className="mp__flex mp__flexCenteredVert mp__flexGrow mp__margLeft10">
+            {
+              METAPORT_CONFIG.skaleNetwork !== MAINNET_CHAIN_NAME ?
+                <Chip
+                  label="TESTNET"
+                  color="primary"
+                  size='small'
+                  className='br__chipXs br__chipGray'
+                /> : null
+            }
+          </div>
           <AccountMenu address={this.props.address} connectMetamask={this.props.connectMetamask} />
           <HelpZen />
           <MoreMenu />
+1 −0		metadata/regression/chains.json
+8 −0		metadata/regression/icons/mainnet.svg
+ −		metadata/regression/logos/mainnet.png