Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dcl upgrade #437

Merged
merged 213 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
213 commits
Select commit Hold shift + click to select a range
0b4fe20
add recent transactions template
Jun 1, 2023
9a0a2f4
add classic pool recent transactions
Jun 2, 2023
e2e5463
update recent transactions table
Jun 3, 2023
e1dbc88
merge main and fix conflict
xieqiancaosissi Jun 5, 2023
c0d3181
fix pool transactions ui
Jun 5, 2023
d78b8af
add pool top bin apr
Jun 5, 2023
59e8caa
add top bin apr in pool list
Jun 5, 2023
7ea828c
add grouped your liquidity
Jun 7, 2023
f1c390a
add liquidity chart
xieqiancaosissi Jun 8, 2023
1d13ed4
add demo
xieqiancaosissi Jun 9, 2023
b5e57eb
update return value of getDclPoolPoints
xieqiancaosissi Jun 9, 2023
8a8561a
update
xieqiancaosissi Jun 9, 2023
f710ddc
update add liquidity page
Jun 9, 2023
1fec037
update package.json
Jun 9, 2023
2d23473
Merge branches 'upgrade-dcl' and 'upgrade-dcl' of github.com:ref-fina…
Jun 10, 2023
4f206bd
add batch_add_liquidity api
Jun 10, 2023
79e8626
add user chart
xieqiancaosissi Jun 10, 2023
c0a946f
fix conflict
xieqiancaosissi Jun 10, 2023
ef4a6ad
add remove chart
xieqiancaosissi Jun 11, 2023
067f264
update e.g.
xieqiancaosissi Jun 11, 2023
7d6a100
update remove liquidity style
Jun 11, 2023
e216f7b
Merge branch 'upgrade-dcl' of github.com:ref-finance/ref-ui into upgr…
Jun 11, 2023
580724f
just for test
xieqiancaosissi Jun 12, 2023
3b9f6ac
update
xieqiancaosissi Jun 12, 2023
b44e10b
update
xieqiancaosissi Jun 13, 2023
9ac5452
add dcl farm
xieqiancaosissi Jun 13, 2023
432f5ff
update dcl farm
xieqiancaosissi Jun 13, 2023
aa6d3c6
add order chart
xieqiancaosissi Jun 17, 2023
a8c3026
update
xieqiancaosissi Jun 17, 2023
7590d73
update
xieqiancaosissi Jun 18, 2023
550d39e
update
xieqiancaosissi Jun 18, 2023
55d4f36
fix swap bug
Jun 18, 2023
702468e
Merge branch 'upgrade-dcl' of github.com:ref-finance/ref-ui into upgr…
Jun 18, 2023
da215b0
add limit order check storage function
Jun 18, 2023
5c174fc
fix bugs
xieqiancaosissi Jun 18, 2023
655332f
update code for tester
xieqiancaosissi Jun 18, 2023
08c3bf8
update
xieqiancaosissi Jun 19, 2023
15a9ddb
update
xieqiancaosissi Jun 19, 2023
c7c10a9
update order chart
xieqiancaosissi Jun 19, 2023
2161461
add liquidity
xieqiancaosissi Jun 26, 2023
2a1b6a7
add your liquidity chart
xieqiancaosissi Jun 26, 2023
8ae6917
add liquidity
xieqiancaosissi Jun 26, 2023
9d1dfca
add remove liquidity function
xieqiancaosissi Jun 27, 2023
4d25aba
update add liquidity page
xieqiancaosissi Jun 28, 2023
f34d986
add slider for remove liquidity
xieqiancaosissi Jun 28, 2023
d2f1afa
add slider for add and remove function
xieqiancaosissi Jun 29, 2023
ca4fda2
fix bug
xieqiancaosissi Jun 29, 2023
7d931aa
fix bugs
xieqiancaosissi Jun 29, 2023
77dd577
update
xieqiancaosissi Jun 30, 2023
7d78b47
add personal chart data
xieqiancaosissi Jun 30, 2023
160f7bf
add user chart
xieqiancaosissi Jul 1, 2023
a112729
add user 24 fee apr
xieqiancaosissi Jul 1, 2023
c7b7158
add user chart hover data
xieqiancaosissi Jul 1, 2023
7a9cd10
fix storage issue
xieqiancaosissi Jul 2, 2023
feef51d
update
xieqiancaosissi Jul 2, 2023
aa5df3f
update
xieqiancaosissi Jul 2, 2023
67eb75f
add small chart
xieqiancaosissi Jul 2, 2023
438f67f
update
xieqiancaosissi Jul 2, 2023
c4c5703
add recent log in table pool
xieqiancaosissi Jul 3, 2023
8e5ee94
fix bugs
xieqiancaosissi Jul 3, 2023
d8a6767
update
xieqiancaosissi Jul 3, 2023
a5f27e9
update
xieqiancaosissi Jul 3, 2023
d3e8556
update
xieqiancaosissi Jul 3, 2023
601b8cc
update
xieqiancaosissi Jul 4, 2023
4bf986b
update
xieqiancaosissi Jul 4, 2023
3c5ec9e
optimize
xieqiancaosissi Jul 4, 2023
1cd7751
update
xieqiancaosissi Jul 4, 2023
ed311a2
fix bug
xieqiancaosissi Jul 5, 2023
4eb2592
fix bug
xieqiancaosissi Jul 5, 2023
b99e813
update
xieqiancaosissi Jul 5, 2023
9aa2f1f
update1
xieqiancaosissi Jul 5, 2023
341fbe5
fix bugs
xieqiancaosissi Jul 5, 2023
b2b6caf
update
xieqiancaosissi Jul 5, 2023
7222715
update
xieqiancaosissi Jul 5, 2023
450b472
fix bugs
xieqiancaosissi Jul 5, 2023
c35f7e4
update
xieqiancaosissi Jul 6, 2023
8dd26c9
fix bugs
xieqiancaosissi Jul 6, 2023
0785a72
update your liquidity
xieqiancaosissi Jul 7, 2023
13ac980
update your liquidity page
xieqiancaosissi Jul 8, 2023
38418c9
update
xieqiancaosissi Jul 8, 2023
b8921e6
update ui
xieqiancaosissi Jul 8, 2023
c6cdfd3
update color
xieqiancaosissi Jul 8, 2023
2e17f68
update
xieqiancaosissi Jul 9, 2023
39c2ad6
update
xieqiancaosissi Jul 9, 2023
cc0d385
fix bug
xieqiancaosissi Jul 9, 2023
5d7a27f
fix bug
xieqiancaosissi Jul 9, 2023
c0c5b72
update the name of a function
xieqiancaosissi Jul 9, 2023
01b4cad
update
xieqiancaosissi Jul 10, 2023
1bb2440
update
xieqiancaosissi Jul 11, 2023
918d758
update
xieqiancaosissi Jul 11, 2023
07f54b4
update
xieqiancaosissi Jul 11, 2023
bde0a79
update
xieqiancaosissi Jul 11, 2023
66aabc3
update icon
xieqiancaosissi Jul 12, 2023
5cc1054
fix bug
xieqiancaosissi Jul 12, 2023
34133cd
update
xieqiancaosissi Jul 12, 2023
c31ba20
fix bug
xieqiancaosissi Jul 13, 2023
c2cd902
update
xieqiancaosissi Jul 13, 2023
484ddeb
update
xieqiancaosissi Jul 14, 2023
8e63de7
add log
xieqiancaosissi Jul 14, 2023
041c437
add log
xieqiancaosissi Jul 14, 2023
e8defc4
add reverse logic
xieqiancaosissi Jul 14, 2023
a4dcc7a
fix bugs
xieqiancaosissi Jul 14, 2023
55d09ee
fix bug
xieqiancaosissi Jul 15, 2023
e55770c
fix bug
xieqiancaosissi Jul 15, 2023
5d6f82f
fix bug
xieqiancaosissi Jul 16, 2023
536855b
fix conflict
xieqiancaosissi Aug 3, 2023
f71abf1
add reverse processing
xieqiancaosissi Aug 6, 2023
2d9b0d9
update yarn.lock
xieqiancaosissi Aug 6, 2023
66c7568
fix bugs about the order of tokens
xieqiancaosissi Aug 6, 2023
99f934f
update to batch interface
xieqiancaosissi Aug 7, 2023
9d7ce74
compelete function
xieqiancaosissi Aug 8, 2023
408c940
handle call back of transition
xieqiancaosissi Aug 9, 2023
4c17212
update top bin apr logic
xieqiancaosissi Aug 9, 2023
e8f39e6
fix ui issue
xieqiancaosissi Aug 9, 2023
d1c369f
update add liquidity ui
xieqiancaosissi Aug 10, 2023
fd4085c
update ui issue
xieqiancaosissi Aug 10, 2023
d518e5b
fix ui bug
xieqiancaosissi Aug 10, 2023
3c1bb19
fix ui bug
xieqiancaosissi Aug 11, 2023
d164af6
fix bugs
xieqiancaosissi Aug 12, 2023
ad62968
fix bug
xieqiancaosissi Aug 12, 2023
9d445a5
fix bugs
xieqiancaosissi Aug 13, 2023
96d2332
optimization
xieqiancaosissi Aug 13, 2023
e899e65
update
xieqiancaosissi Aug 13, 2023
8fa3c65
fix bug
xieqiancaosissi Aug 14, 2023
0b4da85
update mobile ui
xieqiancaosissi Aug 15, 2023
66ddc1c
add mobile style
xieqiancaosissi Aug 16, 2023
59a03ac
fix bugs
xieqiancaosissi Sep 18, 2023
0abc9a7
update
xieqiancaosissi Sep 19, 2023
07855ef
split code
xieqiancaosissi Sep 19, 2023
40c57d3
update
xieqiancaosissi Sep 19, 2023
9c9ea7f
fix bug
xieqiancaosissi Sep 20, 2023
c228297
fix bugs
xieqiancaosissi Sep 20, 2023
a461b08
fix bugs
xieqiancaosissi Sep 20, 2023
54d92fe
fix bugs
xieqiancaosissi Sep 21, 2023
254598c
fix bugs
xieqiancaosissi Sep 21, 2023
101ffae
update style
xieqiancaosissi Sep 21, 2023
abcccc9
fix bugs
xieqiancaosissi Sep 21, 2023
d937bec
optimization
xieqiancaosissi Sep 21, 2023
00d2431
fix bugs
xieqiancaosissi Sep 22, 2023
7fd0728
add tip when too much token amount be entered
xieqiancaosissi Sep 22, 2023
175172c
fix bugs
xieqiancaosissi Sep 23, 2023
f1704fc
fix bugs
xieqiancaosissi Sep 24, 2023
62ee31c
fix bugs
xieqiancaosissi Sep 24, 2023
4f06e1c
fix bugs
xieqiancaosissi Sep 25, 2023
3986245
merge main
xieqiancaosissi Sep 25, 2023
22bc658
update
xieqiancaosissi Sep 25, 2023
d5386e0
fix bugs
xieqiancaosissi Sep 25, 2023
ea15763
fix bugs
xieqiancaosissi Sep 25, 2023
7340b00
optimization
xieqiancaosissi Sep 25, 2023
ec9aad3
optimizatio
xieqiancaosissi Sep 25, 2023
77c73c3
optimization
xieqiancaosissi Sep 26, 2023
19ae2e5
optimization
xieqiancaosissi Sep 26, 2023
6fdf184
add Recent Transactions for fourTokenPool
xieqiancaosissi Sep 26, 2023
62842ed
ui optimization
xieqiancaosissi Sep 26, 2023
38b47c8
add Recent Transactions for two token stable pool
xieqiancaosissi Sep 26, 2023
75e871f
fix bugs
xieqiancaosissi Sep 27, 2023
9a0ecbc
add new dcl log
xieqiancaosissi Sep 27, 2023
9316f0f
ui optimization
xieqiancaosissi Sep 28, 2023
bfee56a
add log and update dcl config
xieqiancaosissi Sep 28, 2023
0b18578
add log
xieqiancaosissi Sep 28, 2023
ee339ec
add log
xieqiancaosissi Sep 28, 2023
f57c501
merge main
xieqiancaosissi Sep 28, 2023
083069f
fix tailwind issue
xieqiancaosissi Sep 28, 2023
36be402
update
xieqiancaosissi Sep 28, 2023
120f9ef
update
xieqiancaosissi Sep 28, 2023
20dcd3c
update
xieqiancaosissi Sep 28, 2023
6e9058f
fix ui issue
xieqiancaosissi Sep 28, 2023
3d00c52
fix bugs
xieqiancaosissi Oct 2, 2023
ec03614
optimization
xieqiancaosissi Oct 3, 2023
879b887
add sort for top bin apr
xieqiancaosissi Oct 7, 2023
78f13a4
split batch function for some wallet
xieqiancaosissi Oct 10, 2023
ac6bcbd
modify the wallet selector versions
xieqiancaosissi Oct 11, 2023
1285a5e
upgrated near-wallet-selector
xieqiancaosissi Oct 18, 2023
62eafe5
update neth wallet version
xieqiancaosissi Oct 18, 2023
7f149d3
handle neth wallet issue
xieqiancaosissi Oct 18, 2023
c1826b6
fix ui issue
xieqiancaosissi Oct 18, 2023
ef76510
update for here-wallet
xieqiancaosissi Oct 19, 2023
949f673
fix here wallet issue
xieqiancaosissi Oct 19, 2023
564c7c8
update
xieqiancaosissi Oct 20, 2023
ca5c841
fix issue
xieqiancaosissi Oct 20, 2023
35e8409
add test code
xieqiancaosissi Oct 20, 2023
974cadc
remove test code
xieqiancaosissi Oct 20, 2023
1141dd5
update
xieqiancaosissi Oct 20, 2023
8cc7d44
fix batch update
xieqiancaosissi Oct 20, 2023
f98a5a4
fix ledger issue for batch opration in farm page
xieqiancaosissi Oct 20, 2023
bb49b01
add test code
xieqiancaosissi Oct 20, 2023
508db79
add test code
xieqiancaosissi Oct 20, 2023
9a1676e
add test code for batch_add
xieqiancaosissi Oct 21, 2023
86cc3fb
update
xieqiancaosissi Oct 21, 2023
052b91b
Merge branch 'main' into dcl-upgrade
xieqiancaosissi Oct 21, 2023
d48d694
fix here wallet batch transtion error
xieqiancaosissi Oct 21, 2023
35e5245
upgrade rxjs versions
xieqiancaosissi Oct 22, 2023
e6a88e3
add farm apr for dcl pool list
xieqiancaosissi Oct 25, 2023
d0121ca
update text for watchList in mobile site
xieqiancaosissi Oct 26, 2023
c921f41
modal ui use package
xieqiancaosissi Oct 27, 2023
5fdae83
change wallet custom ui to standard Ui
xieqiancaosissi Oct 27, 2023
c80df96
update z-index
xieqiancaosissi Oct 27, 2023
545b474
update wallet select ui
xieqiancaosissi Oct 27, 2023
ca4b015
add apr for stable pool
xieqiancaosissi Oct 29, 2023
beb60cc
merge main
xieqiancaosissi Oct 31, 2023
86b3510
update craco.config.cjs
xieqiancaosissi Nov 1, 2023
b4606f7
add webpack-retry-chunk-load-plugin
GavinChen8914 Oct 30, 2023
3124e52
update
xieqiancaosissi Nov 1, 2023
1a87a19
fix batch add issue for legder
xieqiancaosissi Nov 1, 2023
c0a5c95
fix ui issue for ledger
xieqiancaosissi Nov 1, 2023
fe3399f
fix ui issue
xieqiancaosissi Nov 1, 2023
1dd93c4
fix ve pool display issue
xieqiancaosissi Nov 1, 2023
be9141e
remove log
xieqiancaosissi Nov 1, 2023
1c834c8
test
xieqiancaosissi Nov 1, 2023
09b08a4
fix v1 pool display issue
xieqiancaosissi Nov 1, 2023
0e3dd3b
fix mobile ui issue
xieqiancaosissi Nov 2, 2023
7027864
fix ui
xieqiancaosissi Nov 2, 2023
5d40efb
update font size
xieqiancaosissi Nov 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions craco.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'],
},
Expand Down Expand Up @@ -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: {
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
23 changes: 10 additions & 13 deletions src/components/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ export function ConnectToNearBtn() {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setShowWalletSelector(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -211,7 +210,7 @@ export function ConnectToNearBtnGradient({
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -259,7 +258,7 @@ export function ConnectToNearBtnGradientMoible({
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -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>
Expand All @@ -562,8 +561,7 @@ export function ConnectToNearButton(props: any) {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setShowWalletSelector(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -880,7 +878,7 @@ export function GreenConnectToNearBtn(props: any) {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -928,8 +926,7 @@ export function BlacklightConnectToNearBtn(props: any) {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setShowWalletSelector(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -988,7 +985,7 @@ export function ConnectToNearBtnVotingMobile() {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setButtonLoading(true);
modal.show();
}}
>
Expand Down Expand Up @@ -1066,7 +1063,7 @@ export function ConnectToNearBtnSwap() {
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
setButtonLoading(true);
// setButtonLoading(true);
modal.show();
}}
onMouseEnter={() => {
Expand Down
Loading
Loading