Dcl upgrade (#437)

* add recent transactions template * add classic pool recent transactions * update recent transactions table * fix pool transactions ui * add pool top bin apr * add top bin apr in pool list * add grouped your liquidity * add liquidity chart * add demo * update return value of getDclPoolPoints * update * update add liquidity page * update package.json * add batch_add_liquidity api * add user chart * fix conflict * add remove chart * update e.g. * update remove liquidity style * just for test * update * update * add dcl farm * update dcl farm * add order chart * update * update * update * fix swap bug * add limit order check storage function * fix bugs * update code for tester * update * update * update order chart * add liquidity * add your liquidity chart * add liquidity * add remove liquidity function * update add liquidity page * add slider for remove liquidity * add slider for add and remove function * fix bug * fix bugs * update * add personal chart data * add user chart * add user 24 fee apr * add user chart hover data * fix storage issue * update * update * add small chart * update * add recent log in table pool * fix bugs * update * update * update * update * update * optimize * update * fix bug * fix bug * update * update1 * fix bugs * update * update * fix bugs * update * fix bugs * update your liquidity * update your liquidity page * update * update ui * update color * update * update * fix bug * fix bug * update the name of a function * update * update * update * update * update * update icon * fix bug * update * fix bug * update * update * add log * add log * add reverse logic * fix bugs * fix bug * fix bug * fix bug * add reverse processing * update yarn.lock * fix bugs about the order of tokens * update to batch interface * compelete function * handle call back of transition * update top bin apr logic * fix ui issue * update add liquidity ui * update ui issue * fix ui bug * fix ui bug * fix bugs * fix bug * fix bugs * optimization * update * fix bug * update mobile ui * add mobile style * fix bugs * update * split code * update * fix bug * fix bugs * fix bugs * fix bugs * fix bugs * update style * fix bugs * optimization * fix bugs * add tip when too much token amount be entered * fix bugs * fix bugs * fix bugs * fix bugs * update * fix bugs * fix bugs * optimization * optimizatio * optimization * optimization * add Recent Transactions for fourTokenPool * ui optimization * add Recent Transactions for two token stable pool * fix bugs * add new dcl log * ui optimization * add log and update dcl config * add log * add log * fix tailwind issue * update * update * update * fix ui issue * fix bugs * optimization * add sort for top bin apr * split batch function for some wallet * modify the wallet selector versions * upgrated near-wallet-selector * update neth wallet version * handle neth wallet issue * fix ui issue * update for here-wallet * fix here wallet issue * update * fix issue * add test code * remove test code * update * fix batch update * fix ledger issue for batch opration in farm page * add test code * add test code * add test code for batch_add * update * fix here wallet batch transtion error * upgrade rxjs versions * add farm apr for dcl pool list * update text for watchList in mobile site * modal ui use package * change wallet custom ui to standard Ui * update z-index * update wallet select ui * add apr for stable pool * update craco.config.cjs * add webpack-retry-chunk-load-plugin * update * fix batch add issue for legder * fix ui issue for ledger * fix ui issue * fix ve pool display issue * remove log * test * fix v1 pool display issue * fix mobile ui issue * fix ui * update font size --------- Co-authored-by: Max <[email protected]> Co-authored-by: nature.xie <[email protected]> Co-authored-by: Gavin <[email protected]>
ref-finance · Nov 2, 2023 · cd47b4e · cd47b4e
1 parent 9010f10
commit cd47b4e
Show file tree

Hide file tree

Showing 97 changed files with 23,598 additions and 10,883 deletions.
diff --git a/craco.config.cjs b/craco.config.cjs
@@ -4,6 +4,8 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 const isProduction = process.env.NODE_ENV === 'production';
 const { ProvidePlugin } = require('webpack');
+const { RetryChunkLoadPlugin } = require('webpack-retry-chunk-load-plugin');
+
 // Linting and type checking are only necessary as part of development and testing.
 // Omit them from production builds, as they slow down the feedback loop.
 const shouldLintOrTypeCheck = !isProduction;
@@ -47,6 +49,10 @@ module.exports = {
           filename: 'static/css/[name].[contenthash:8].css',
           chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
         }),
+        new RetryChunkLoadPlugin({
+          retryDelay: 2000,
+          maxRetries: 3,
+        }),
       ],
       remove: ['CaseSensitivePathsPlugin', 'IgnorePlugin'],
     },
@@ -88,6 +94,13 @@ module.exports = {
       webpackConfig.ignoreWarnings = [/Failed to parse source map/];
 
       webpackConfig.module.rules = [
+        {
+          test: /\.m?js$/,
+          resolve: {
+            fullySpecified: false, // disable the behaviour
+          },
+          include: [/node_modules/]
+        },
         {
           test: /\.(js|mjs|jsx|ts|tsx)$/,
           use: {

diff --git a/package.json b/package.json
@@ -81,7 +81,8 @@
     "typescript": "^4.9.5",
     "url": "^0.11.0",
     "url-loader": "4.1.1",
-    "webpack": "5.89.0"
+    "webpack": "5.89.0",
+    "webpack-retry-chunk-load-plugin": "3.1.1"
   },
   "dependencies": {
     "@aurora-is-near/engine": "think-in-universe/aurora.js#6db862e",
@@ -90,18 +91,18 @@
     "@craco/craco": "7.1.0",
     "@ledgerhq/devices": "^7.0.0",
     "@metamask/detect-provider": "^2.0.0",
-    "@near-wallet-selector/core": "^7.0.0",
-    "@near-wallet-selector/here-wallet": "^8.1.0",
-    "@near-wallet-selector/ledger": "^7.0.0",
-    "@near-wallet-selector/math-wallet": "^7.0.2",
-    "@near-wallet-selector/meteor-wallet": "^7.9.0",
-    "@near-wallet-selector/modal-ui": "^7.0.2",
-    "@near-wallet-selector/my-near-wallet": "^7.0.0",
-    "@near-wallet-selector/near-wallet": "^7.0.0",
-    "@near-wallet-selector/neth": "^7.0.2",
-    "@near-wallet-selector/nightly": "^7.0.2",
-    "@near-wallet-selector/sender": "^7.0.0",
-    "@near-wallet-selector/wallet-connect": "^7.0.2",
+    "@near-wallet-selector/core": "^8.5.4",
+    "@near-wallet-selector/here-wallet": "^8.5.4",
+    "@near-wallet-selector/ledger": "^8.5.4",
+    "@near-wallet-selector/math-wallet": "^8.5.4",
+    "@near-wallet-selector/meteor-wallet": "^8.5.4",
+    "@near-wallet-selector/modal-ui": "^8.5.4",
+    "@near-wallet-selector/my-near-wallet": "^8.5.4",
+    "@near-wallet-selector/near-wallet": "^8.5.4",
+    "@near-wallet-selector/neth": "^7.9.1",
+    "@near-wallet-selector/nightly": "^8.5.4",
+    "@near-wallet-selector/sender": "^8.5.4",
+    "@near-wallet-selector/wallet-connect": "^8.5.4",
     "@react-icons/all-files": "https://github.com/react-icons/react-icons/releases/download/v4.7.1/react-icons-all-files-4.7.1.tgz",
     "@transak/transak-sdk": "1.2.2",
     "@types/animejs": "^3.1.4",
@@ -167,7 +168,7 @@
     "recharts": "^2.1.6",
     "reconnecting-websocket": "^4.4.0",
     "respinner": "^3.0.8",
-    "rxjs": "^7.5.5",
+    "rxjs": "7.8.1",
     "socket.io-client": "^4.5.4",
     "swiper": "^6.8.4",
     "web3-eth-abi": "1.8.2"

diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx
@@ -154,8 +154,7 @@ export function ConnectToNearBtn() {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
-          // setShowWalletSelector(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -211,7 +210,7 @@ export function ConnectToNearBtnGradient({
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -259,7 +258,7 @@ export function ConnectToNearBtnGradientMoible({
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -534,8 +533,8 @@ export function OprationButton(props: any) {
         onClick={onClick}
         disabled={disabled}
         className={`flex items-center justify-center  w-full h-full ${
-          btnClassName ? btnClassName : ''
-        }`}
+          disabled ? 'cursor-not-allowed' : ''
+        } ${btnClassName ? btnClassName : ''}`}
       >
         {props.children}
       </button>
@@ -562,8 +561,7 @@ export function ConnectToNearButton(props: any) {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
-          // setShowWalletSelector(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -880,7 +878,7 @@ export function GreenConnectToNearBtn(props: any) {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -928,8 +926,7 @@ export function BlacklightConnectToNearBtn(props: any) {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
-          // setShowWalletSelector(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -988,7 +985,7 @@ export function ConnectToNearBtnVotingMobile() {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
+          // setButtonLoading(true);
           modal.show();
         }}
       >
@@ -1066,7 +1063,7 @@ export function ConnectToNearBtnSwap() {
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setButtonLoading(true);
+          // setButtonLoading(true);
           modal.show();
         }}
         onMouseEnter={() => {