Skip to content

Commit

Permalink
feat: new swap (#1172)
Browse files Browse the repository at this point in the history
* chore: add rabby-swap

* feat: swap

* fix: ts

* fix: swap token approve

* fix: dexid

* fix: dexid

* fix: tx params

* feat: + swap service

* feat: custom gasPrice will expire in 1h (#1171)

* feat: + expire

* fix: is stableCoin

* feat: swap

* feat: swap

* fix: chain default token

* fix: reset state when dexId change

* feat: gas fee calc

* feat: update

* fix: style

* fix: style

* fix: stable coin price diff

* fix: style

* fix: style

* fix: close window after submitting swap tx

* fix: style

* fix: style

* fix: margin

* feat: queue

* chore: rm old swap code (#1173)

* chore: rm old swap code

* chore: rm old rabby swap abi

* fix: swap loading

* fix: icon

* fix: button loading status

* fix: swap gas cache not work (#1174)

* feat: skip verify when warpToken/from is native

* fix: style

* fix: payAmount

* feat: Rabby fee  display %

* feat: remeber last unlimitedAllowance

* fix: slippage tips

* fix: slippage input

* feat: add two step approve modal

* fix: increase loading time

* fix: balance rounding mode

* fix: pay amount rounding mode

* fix: remove console

* fix: 4x gas

* chore: update rabby-swap

* fix: style

* fix: style

* fix: style

* fix: token swap

* fix: checkbox bg

* fix: style

* fix: text

* feat: + changelog

Co-authored-by: DMY <[email protected]>
  • Loading branch information
vvvvvv1vvvvvv and dmy147 authored Dec 9, 2022
1 parent 1f2ebfc commit 97c8073
Show file tree
Hide file tree
Showing 57 changed files with 3,264 additions and 2,267 deletions.
1 change: 1 addition & 0 deletions changeLogs/0610.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Swap is back online, integrating popular Dexes
2 changes: 2 additions & 0 deletions changeLogs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import version0490 from './0490.md';
import version0530 from './0530.md';
import version0560 from './0560.md';
import version0570 from './0570.md';
import version0610 from './0610.md';

const version = process.env.release || '0';
const versionMap = {
Expand All @@ -16,6 +17,7 @@ const versionMap = {
'0.53.0': version0530,
'0.56.0': version0560,
'0.57.1': version0570,
'0.61.0': version0610,
};
export const getUpdateContent = () => {
return versionMap[version];
Expand Down
Binary file removed docs/PeckShield-Audit-Report-RabbyRouter-v1.0.pdf
Binary file not shown.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"@rabby-wallet/eth-watch-keyring": "^1.0.0",
"@rabby-wallet/gnosis-sdk": "^1.3.1",
"@rabby-wallet/page-provider": "^0.1.10",
"@rabby-wallet/rabby-swap": "^0.0.6",
"@rabby-wallet/widgets": "^1.0.9",
"@rematch/core": "^2.2.0",
"@rematch/select": "^3.1.2",
Expand Down
2 changes: 2 additions & 0 deletions src/background/controller/provider/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ interface ApprovalRes extends Tx {
isSend?: boolean;
isSpeedUp?: boolean;
isCancel?: boolean;
isSwap?: boolean;
isGnosis?: boolean;
account?: Account;
extra?: Record<string, any>;
Expand Down Expand Up @@ -285,6 +286,7 @@ class ProviderController extends BaseController {
let signedTransactionSuccess = false;
delete txParams.isSend;
delete approvalRes.isSend;
delete approvalRes.isSwap;
delete approvalRes.address;
delete approvalRes.type;
delete approvalRes.uiRequestComponent;
Expand Down
Loading

0 comments on commit 97c8073

Please sign in to comment.