Skip to content

Merge dev into stage #390

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 73 commits into
base: stage
Choose a base branch
from
Open

Merge dev into stage #390

wants to merge 73 commits into from

Conversation

@SSSensational
Copy link
Contributor

@SSSensational SSSensational commented Apr 24, 2025 •
edited by boqiu
Loading

This change is Reviewable

SSSensational and others added 30 commits June 30, 2023 17:38
@SSSensational
Merge pull request #267 from Conflux-Chain/stage
3697086 
Stage
@AngeliaQ
Merge pull request #305 from Conflux-Chain/stage
384b7a8 
Stage
@AngeliaQ
Merge pull request #308 from Conflux-Chain/stage
a1441da 
Stage
@AngeliaQ
Merge pull request #317 from Conflux-Chain/stage
3761835 
Governance 2.0 Mainnet
@cryptosunshine
Merge pull request #320 from Conflux-Chain/stage
9ce753b 
fix: apy
@AngeliaQ
Merge pull request #323 from Conflux-Chain/stage
db37b94
@cryptosunshine
Merge pull request #326 from Conflux-Chain/stage
1675e4a 
fix: rpc params and decimals
@SSSensational
Merge pull request #329 from Conflux-Chain/stage
48b6c30 
Stage
@mosshqq
Merge pull request #333 from Conflux-Chain/stage
e35c953 
Stage
@SSSensational
Merge pull request #336 from Conflux-Chain/stage
fc61cdf 
Stage
@cryptosunshine
Merge pull request #357 from Conflux-Chain/stage
2cf755b 
feat: Governance eSpace voting.
@cryptosunshine
feat: add Base Fee Sharing Prop
5ec3a27
@cryptosunshine
fix: calc move to VotingResult
1c99554
@cryptosunshine
fix: rm the comments
ee0336b
@cryptosunshine
fix: Default chainId
f9426ad
@SSSensational
Merge pull request #358 from Conflux-Chain/cip-137
db91aca 
Cip 137
@cryptosunshine
fix: optimic network
920a6b7
@cryptosunshine
Merge pull request #360 from Conflux-Chain/cip-137
4e6a44c 
fix: optiamic  network
@AngeliaQ
Merge pull request #362 from Conflux-Chain/dev
d9d998e 
CIP-137
@cryptosunshine
fix: Lock the react-hook-form version and remove shuttle-flow
7c7101a
@cryptosunshine
Merge pull request #363 from Conflux-Chain/fix/build-node
6715580 
fix: Lock the react-hook-form version and remove shuttle-flow
@cryptosunshine
Merge pull request #364 from Conflux-Chain/dev
65ed844 
Lock the react-hook-form version and remove shuttle-flow
@mosshqq
fix: update use-wallet-react
0debc79
@SSSensational
Merge pull request #365 from Conflux-Chain/fix/use-wallet-update
1356868 
fix: update use-wallet-react
@mosshqq
fix: update use-wallet-react
67f8449
@mosshqq
Merge pull request #366 from Conflux-Chain/fix/use-wallet-update
67b0cd6 
fix: update use-wallet-react
@mosshqq
fix: update use-wallet-react
c3c4758
@mosshqq
Merge pull request #367 from Conflux-Chain/fix/use-wallet-update
f9470d4 
fix: update use-wallet-react
@mosshqq
fix: update use-wallet-react
3819adf
@iosh
Merge pull request #368 from Conflux-Chain/fix/use-wallet-update
ad60d83 
fix: update use-wallet-react
mosshqq and others added 30 commits November 18, 2024 10:42
@mosshqq
Merge pull request #376 from Conflux-Chain/fix/version
152f17e 
fix: revert custom-react-scrollbar version
@SSSensational
Merge pull request #374 from Conflux-Chain/dev
7a3964f 
fix: wallet connect
@cryptosunshine
fix: Fixed the calculation method of Storage Point Prop voting.
28ec4c7
@cryptosunshine
fix: Formatting fixes
1eecf0d
@SSSensational
Merge pull request #377 from Conflux-Chain/fix-storage-voting
83d3788 
Fix storage voting
@iosh
chore: Fix case-sensitivity conflicts
d5da1b9
@AngeliaQ
Merge pull request #381 from Conflux-Chain/filename
867a78d 
chore: Fix case-sensitivity conflicts
@cryptosunshine
feat: native usdt0 init
cba84e8
@cryptosunshine
feat: Detail Adjustment for native usdt0
56e430b
@cryptosunshine
fix: Delete unnecessary pictures
afe34ce
@cryptosunshine
Merge pull request #382 from Conflux-Chain/usdt0
40bb1a2 
Usdt0
@cryptosunshine
fix: Determine NavbarVisible
b9edc13
@cryptosunshine
feat: hide usdt0 wallet
edca8c4
@cryptosunshine
fix: WalletConnector
6665f8b
@cryptosunshine
Merge pull request #383 from Conflux-Chain/usdt0
7981a47 
fix: Determine NavbarVisible
@cryptosunshine
fix: UI
f022e97
@cryptosunshine
fix: Refining public card shadows
45eafae
@cryptosunshine
Merge pull request #384 from Conflux-Chain/usdt0
51b7c7f 
fix: UI
@SSSensational
fix: change scanurl to .org
e5c259c
@SSSensational
Merge pull request #385 from Conflux-Chain/scanurl
158041b 
fix: change scanurl to .org
@SSSensational
fix: update validator url
d00c07f
@SSSensational
Merge pull request #389 from Conflux-Chain/validator
4d8c36f 
fix: update validator url
@SSSensational
feat: eSpace support eip6963
99548ba
@SSSensational
Merge pull request #395 from Conflux-Chain/connect
6e2ebf0 
feat: eSpace support eip6963
@iosh
build: fixed vite version
6264496
@SSSensational
Merge pull request #396 from Conflux-Chain/vite
857df4f 
build: fixed vite version
@SSSensational
feat: Force Fluent to obtain cross-chain permissions
0170baa
@SSSensational
Merge pull request #397 from Conflux-Chain/connect
4169059 
feat: Force Fluent to obtain cross-chain permissions
@SSSensational
fix: Firefox input arrow & Fluent ethereum connect
31b0e18
@AngeliaQ
Merge pull request #398 from Conflux-Chain/firefox
a1cf9e4 
fix: Firefox input arrow & Fluent ethereum connect
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@SSSensational @AngeliaQ @cryptosunshine @mosshqq @iosh