hotfix - walletLayer1 balance

Author: windatang

packages/web-bridge/.env.development

@@ -14,6 +14,10 @@ REACT_APP_WALLET_CONNECT_BRIDGE=https://wcbridge.loopring.io
 REACT_APP_WALLET_CONNECT_PING=https://wcbridge.loopring.io/hello
 
 REACT_APP_API_URL=api3.loopring.io
+#https://dev.loopring.io  uat2.loopring.io  dev.loopring.io
 REACT_APP_API_URL_UAT=uat2.loopring.io
 SKIP_PREFLIGHT_CHECK=true
-REACT_APP_WITH_PRO=true
+REACT_APP_WITH_PRO=true
+
+#DEV 0x355E9941C5e301033ecfD37184E78443c5241035 UAT 0xfDDA90dbCc99B3a91e3fB1292991Ba1076d9E281
+REACT_APP_GOERLI_NFT_FACTORY_COLLECTION=0x355E9941C5e301033ecfD37184E78443c5241035

packages/web-bridge/.env.production

@@ -15,8 +15,3 @@ REACT_APP_API_URL=api3.loopring.io
 REACT_APP_API_URL_UAT=uat2.loopring.io
 SKIP_PREFLIGHT_CHECK=true
 REACT_APP_WITH_PRO=true
-
-#REACT_APP_FORTMATIC_API_KEY=pk_test_A6260FCBAA2EBDFB
-#REACT_APP_MAGIC_API_KEY=pk_test_398B82F5F0E88874
-#REACT_APP_PORTIS_DAPP_ID=e9be171c-2b7f-4ff0-8db9-327707511ee2
-

packages/web-bridge/README.md

@@ -1,23 +1,77 @@
-scp  -i ~/Documents/infos/kstore/1.pm -r build ubuntu@18.182.7.84:~/tradingroom/leochan/loopring-web/packages/webapp
+<p align="center">
+  <a href="https://github.com/Loopring/loopring-web-v2" rel="noopener" target="_blank"><img width="150" src="https://loopring.org/images/logo.svg" alt="Loopring-website"></a>
+</p>
 
-# Generate CA private key 
-openssl genrsa -out ca.key 2048 
-# Generate CSR 
-openssl req -new -key ca.key -out ca.csr
-# Generate Self Signed certificate（CA 根证书）
-openssl x509 -req -days 3650 -in ca.csr -signkey ca.key -out ca.crt
+<h1 align="center">Loopring Application</h1>
+<div align="center">
+<h2>Ethereum’s First zkRollup Layer2</h2>
+<p>Secure, Fast, and Cheap</p>
 
--config
+[![license](https://img.shields.io/badge/license-MIT-blue)](https://github.com/Loopring/loopring-web-v2/master/LICENSE)
 
-# private key
-openssl genrsa -des3 -out server.key 1024 
-# generate csr
-openssl req -new -key server.key -out server.csr
-# generate certificate
-openssl ca -in server.csr -out server.crt -cert ca.crt -keyfile ca.key
+[![type-badge](https://img.shields.io/npm/types/react-data-grid)](https://www.npmjs.com/package/react-data-grid)
 
-openssl genrsa -des3 -out client.key 1024 
-openssl req -new -key client.key -out client.csr
-openssl ca -in client.csr -out client.crt -cert ca.crt -keyfile ca.key
+<!-- [![Materi-UI](https://img.shields.io/npm/types/react-data-grid)](https://www.npmjs.com/package/react-data-grid) -->
 
-export OPENSSL_CONF=/usr/lib/ssl/openssl.cnf
+</div>
+
+## 🚀 Quick Start
+
+```bash
+// with yarn
+yarn install
+yarn up
+cd ./packages/webapp
+npm run dev
+
+
+``` 
+## 📚 Loopring UI component StoryBook
+```bash 
+
+cd ./packages/component-lib
+npm run storybook
+```
+
+## 🏗 Framework Design
+
+![](https://static.loopring.io/Loopring%20framwork.png)
+
+## 👉 [What is Loopring?](https://loopring.org/#/)
+
+## 🫂 Community
+- [Loopring Website](https://loopring.org/)
+- [Loopring Exchange](https://loopring.io/#/layer2)
+- [Loopring Reddit](https://www.reddit.com/r/loopringorg/)
+- [Loopring Medium](https://medium.com/loopring-protocol)
+- [Loopring Twitter](https://twitter.com/loopringorg)
+- [Loopring Telegram](https://t.me/loopring_en)
+
+
+## 👺 For Developer
+- We appreciate any improvements or initiatives for Loopring Layer2 website, please view the source code in `./packages/component-lib`.
+- The project contains a separate lib "web3-provider", which is a third-party ETH web3 wallet provider service (wallectConnect & metamask),
+- You are welcome to reuse it or integrate your provider service with our website.
+- Feel free to leave suggestions or ideas.
+
+### 📒 API & Dependency
+- [Web3-Provider](https://www.npmjs.com/package/@loopring-web/web3-provider)
+- [Loopring-sdk](https://www.npmjs.com/package/@loopring-web/loopring-sdk)
+- [Python](https://github.com/Loopring/hello_loopring)
+- [APIs](https://docs.loopring.io/en/)
+
+
+## 🙋 Protocol & Architecture
+
+- [Whitepaper](https://loopring.org/resources/en_whitepaper.pdf)
+- [Design Docs](https://github.com/LoopringSecondary/docs/wiki/Loopring3_Design)
+
+## ❓[Help](https://desk.zoho.com/portal/loopring/en/home)
+
+## 🔑 Security
+
+- [Wallet](https://security.loopring.io/)
+- [Protocol Audit](https://loopring.org/resources/loopring1.0_audit.pdf)
+
+## Release Process
+alpha.loopring.io, beta.loopring.io, static.loopring.io, and loopring.io are now auto deployed using Vercel.

packages/web-bridge/config-overrides.js

@@ -9,11 +9,16 @@ const {
 } = require("customize-cra");
 
 const CopyWebpackPlugin = require("copy-webpack-plugin");
+const HtmlWebpackPlugin = require("html-webpack-plugin"); //installed via npm
 
 // Try the environment variable, otherwise use root
 const ASSET_PATH = process.env.ASSET_PATH || "/";
 // const rewireLess = require('react-app-rewire-less')
+
+const { alias } = require("react-app-rewire-alias");
+
 const path = require("path");
+
 const GitRevisionPlugin = require("git-revision-webpack-plugin");
 const gitRevisionPlugin = new GitRevisionPlugin();
 
@@ -107,64 +112,19 @@ module.exports = override(
     console.log("-----> enter config!!!!!!!");
 
     const setConfig = (index) => {
-      let babelLoader = config.module.rules[1].oneOf[index];
       console.log("-----> enter setConfig!!!!!!! index:", index);
+      let babelLoader = config.module.rules[1].oneOf[index];
       babelLoader.include = babelLoader.include.replace("/web-bridge/src", "");
       config.module.rules[1].oneOf[index] = babelLoader;
     };
 
     setConfig(4);
-
-    // addCompression()
-
-    // addAnalyzer()
-
-    // setConfig(3);
-
-    /*
-    const oneOf_loc = config.module.rules.findIndex((n) => n.oneOf) // 这里的config是全局的
-    config.module.rules[oneOf_loc].oneOf = [
-      {
-        test: /\.module\.less$/,
-        use: getStyleLoaders(
-          {
-            importLoaders: 2,
-            modules: {
-              getLocalIdent: getCSSModuleLocalIdent,
-            },
-          },
-          'less-loader',
-        ),
-      },
-      ...config.module.rules[oneOf_loc].oneOf,
-    ]
-
-    config.resolve.modules = [
-      path.resolve(__dirname, "..", "src"),
-      "node_modules",
-
-    ]*/
     config.resolve.alias = {
       ...config.resolve.alias,
       "@material-ui/core/Menu": "@mui/material/Menu",
       "@material-ui/core": "@mui/material",
       "@material-ui/core/Popover": "@mui/material/Popover",
     };
-    // config.resolve = [
-    //   alias({
-    //
-    //   })(config)
-    // ]
-
     return config;
   }
-  /*
-  function override(config, env) {
-    config = rewireLess.withLoaderOptions({
-      javascriptEnabled: true,
-    })(config, env)
-
-    return config
-  },
-  */
 );

packages/web-bridge/src/App.tsx

@@ -1,3 +1,5 @@
+// import { ModalProvider } from 'styled-react-modal'
+import RouterView from "./routers";
 import { GlobalStyles } from "@mui/material";
 import { css, Theme, useTheme } from "@emotion/react";
 import { globalCss, SagaStatus } from "@loopring-web/common-resources";
@@ -8,7 +10,6 @@ import { useTranslation } from "react-i18next";
 
 import { HashRouter as Router, useLocation } from "react-router-dom";
 import { store } from "@loopring-web/core";
-import RouterView from "./routers";
 
 const ScrollToTop = () => {
   const { pathname } = useLocation();
@@ -30,11 +31,11 @@ const App = () => {
     if (storeLan !== language) {
       store.dispatch(setLanguage(language));
     }
-  }, [language, storeLan]);
+  }, [storeLan, language]);
 
   React.useEffect(() => {
     if (window.location.protocol !== "https:") {
-      console.log("Contract NFTMeta error::", window.location.protocol);
+      console.log("Current PROTOCOL::", window.location.protocol);
       window.location.replace(
         `https:${window.location.href.substring(
           window.location.protocol.length
@@ -59,24 +60,25 @@ const App = () => {
           `
             : ``
         }
+
+
       }
 
-      body:before {
-        ${
-          theme.mode === "dark"
-            ? `
+          body:before {
+            ${
+              theme.mode === "dark"
+                ? `
             background: var(--color-global-bg);
        `
-            : ""
-        }
+                : ""
+            }
       }
     }`}
       />
 
       <Router>
         <ScrollToTop />
         <RouterView state={state as SagaStatus} />
-        {/*<RouterView state={state} />*/}
       </Router>
     </>
   );

packages/web-bridge/src/index.tsx

@@ -44,7 +44,6 @@ const ProviderThen = React.memo(({ children }: { children: JSX.Element }) => {
   const providers: Array<[TProvider<any>, any]> = [
     provider(MuThemeProvider as any, { theme: getTheme(themeMode, isMobile) }),
     provider(ThemeProvider as any, { theme: getTheme(themeMode, isMobile) }),
-    provider(ReactReduxFirebaseProvider as any, { ...firebaseProps }),
     provider(PersistGate as any, { persistor, loading: null }),
     provider(TimeoutCheckProvider as any),
   ] as any;
@@ -53,9 +52,11 @@ const ProviderThen = React.memo(({ children }: { children: JSX.Element }) => {
 
 ReactDOM.render(
   <ProviderApp>
-    <ProviderThen>
-      <App />
-    </ProviderThen>
+    <ReactReduxFirebaseProvider {...firebaseProps}>
+      <ProviderThen>
+        <App />
+      </ProviderThen>
+    </ReactReduxFirebaseProvider>
   </ProviderApp>,
   document.getElementById("root")
 );

packages/webapp/Dockerfile

@@ -119,57 +119,12 @@ module.exports = override(
     };
 
     setConfig(4);
-
-    // addCompression()
-
-    // addAnalyzer()
-
-    // setConfig(3);
-
-    /*
-    const oneOf_loc = config.module.rules.findIndex((n) => n.oneOf) // 这里的config是全局的
-    config.module.rules[oneOf_loc].oneOf = [
-      {
-        test: /\.module\.less$/,
-        use: getStyleLoaders(
-          {
-            importLoaders: 2,
-            modules: {
-              getLocalIdent: getCSSModuleLocalIdent,
-            },
-          },
-          'less-loader',
-        ),
-      },
-      ...config.module.rules[oneOf_loc].oneOf,
-    ]
-
-    config.resolve.modules = [
-      path.resolve(__dirname, "..", "src"),
-      "node_modules",
-
-    ]*/
     config.resolve.alias = {
       ...config.resolve.alias,
       "@material-ui/core/Menu": "@mui/material/Menu",
       "@material-ui/core": "@mui/material",
       "@material-ui/core/Popover": "@mui/material/Popover",
     };
-    // config.resolve = [
-    //   alias({
-    //
-    //   })(config)
-    // ]
-
     return config;
   }
-  /*
-  function override(config, env) {
-    config = rewireLess.withLoaderOptions({
-      javascriptEnabled: true,
-    })(config, env)
-
-    return config
-  },
-  */
 );