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

Merge develop in to release/2.27.0 #11847

Merged
merged 32 commits into from
Nov 4, 2024
Merged

Merge develop in to release/2.27.0 #11847

merged 32 commits into from
Nov 4, 2024

Conversation

swkatmask
Copy link
Contributor

No description provided.

guanbinrui and others added 24 commits September 14, 2024 11:40
* fix: mf-6406 network name and network fee

* fix: fixup mf-6402

* fix: mf-6415 remove unused tip icons

* fix: network node in bridge trading route

* fix: mf-6394 calc swap value

* fix: token icon

* fix: mf-6395 when passing native token

* fix: mf-6399 show best route in quote

* fix: mf-6403 bridge rate in confirm page

* fix: mf-6404 correct chain id in bridge confirm page

* fix: mf-6412 don't show stale while approving

* fix: bridge transaction status

* fix: mf-6414 mf-6411 swap and bridge

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* fix: mf-6378 default token for metis

* fix: mf-6427 missing network in transaction page

* fix: mf-6411 mf-6414 checking spender loading status

* fix: mf-6429 adjust price difference

* fix: mf-6410 mf-6430 failed transaction

* fix: mf-6428 remove unnecessary toast

* fix: detect leaved view

* fix: mf-6431 bridge transaction

* fix: mf-6403 align rate

* fix: mf-6432 add missing bridge icon

* fix: mf-6433 text overflow

* fix: bridge tokens

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* fix: date format

* refactor: rename useSwap to useTrade

* fix: check allowance before sending tx

* fix: mf-6436 do not override mode manually

* fix: i18n

* fix: mf-6434 check liquid providers

* refactor: align spender

* fix: no need to check allowance for native token

* fix: store transaction duration in seconds

* fix: mf-6439 handle maximum amount message

* fix: mf-6435 custom snackbar message for swap/bridge

* fix: mf-6437 picking token

* fix: mf-6438 adjust quote route style

* fix: mf-6406 text in bridge confirm page

* fix: mf-6411 mf-6414 swap/bridge

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* fix: show network full name

* fix: transaction fee

* fix: logic

* feat: mf-6440 show token balance and add max button

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* fix: mf-6435 custom snackbar message for swap/bridge

* fix: mf-6444 network fee for bridge

* fix: mf-6445 move unlock tx in try-catch

* fix: transaction page

* fix: format token balance

* fixup! refactor: mf-6329 rename $MATIC to $POL (#11824)

* fix: rounding mode

* fix: follow up reviews

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* feat: mf-6447 remove events tab in calendar

* fix: go plus percent number
* fix: bridge ux details

* fix: approve token

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
@guanbinrui guanbinrui changed the title merge develop in to release/2.27 Merge develop in to release/2.27.0 Oct 12, 2024
swkatmask and others added 5 commits October 12, 2024 14:45
* fix: allowance comparing

* fix: discard gas for arbitrum

* fix: add failed toast for from tx

* fix: mf-6450 reset input amount

* fix: check tx status right after submitting

* fix: swap all when set to max

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
* fix(Trader): refetch data every 20 seconds

* fix: add bridge bunge refuel

* fix: validate custom gas settings

* fixup! fix: add bridge bunge refuel

* fix: run codegen

---------

Co-authored-by: swkatmask <swkatmask@users.noreply.github.com>
@swkatmask swkatmask force-pushed the chore/merge-develop branch from fc412ac to b85eefd Compare October 12, 2024 07:11
@Jack-Works
Copy link
Member

I believe you need help since the develop changed a lot recently. Please give me a list of PRs that needed to be merged into the develop branch and I'll merge it.

@swkatmask swkatmask marked this pull request as ready for review November 4, 2024 06:44
@guanbinrui guanbinrui merged commit 9b426cf into develop Nov 4, 2024
3 checks passed
@guanbinrui guanbinrui deleted the chore/merge-develop branch November 4, 2024 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants