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

Fix: use correct values for swap order surplus calculation #3653

Merged
merged 1 commit into from
May 3, 2024

Conversation

jmealy
Copy link
Contributor

@jmealy jmealy commented May 3, 2024

What it solves

This PR seems to have been overwritten: #3628
This is a duplicate.

Resolves: https://www.notion.so/safe-global/Check-surplus-calculation-31c4ea517ab74a2a8c8f1555a6447fb1?pvs=4

How this PR fixes it

  • use the correct values to calculate surplus depending on the order type
    • for buy orders: (executed sell amount) - (order sell amount)
    • for sell orders: (order buy amount) - (executed sell amount)

How to test it

Checklist

  • I've tested the branch on mobile 📱
  • I've documented how it affects the analytics (if at all) 📊
  • I've written a unit/e2e test for it (if applicable) 🧑‍💻

Copy link

github-actions bot commented May 3, 2024

@jmealy jmealy requested a review from compojoom May 3, 2024 12:14
@jmealy jmealy marked this pull request as ready for review May 3, 2024 12:14
Copy link

github-actions bot commented May 3, 2024

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type Occurrences Fixable
Errors 0 0
Warnings 0 0
Ignored 0 N/A
  • Result: ✅ success
  • Annotations: 0 total

Report generated by eslint-plus-action

Copy link

github-actions bot commented May 3, 2024

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 1007.6 KB (🟡 +1.28 KB)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

New Page Added

The following page was added to the bundle from the code in this PR:

Page Size (compressed) First Load
/swap 28.04 KB 1.01 MB

Thirteen Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load
/apps 50.06 KB (🟡 +3.47 KB) 1.03 MB
/apps/custom 41.68 KB (🟡 +3.47 KB) 1.02 MB
/apps/open 85.07 KB (🟡 +10 KB) 1.07 MB
/balances 30.63 KB (🟡 +738 B) 1.01 MB
/home 63.68 KB (🟡 +3.91 KB) 1.05 MB
/new-safe/create 32.39 KB (🟡 +10 B) 1.02 MB
/new-safe/load 18.53 KB (🟡 +10 B) 1 MB
/settings/safe-apps 25.33 KB (🟡 +3.47 KB) 1.01 MB
/transactions 107.35 KB (🟡 +5.74 KB) 1.09 MB
/transactions/history 107.32 KB (🟡 +5.74 KB) 1.09 MB
/transactions/messages 67.11 KB (🟡 +5.74 KB) 1.05 MB
/transactions/queue 62.77 KB (🟡 +5.74 KB) 1.05 MB
/transactions/tx 52.12 KB (🟡 +5.75 KB) 1.03 MB
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

Next to the size is how much the size has increased or decreased compared with the base branch of this PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this.

Copy link

github-actions bot commented May 3, 2024

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements
78.87% (-0.01% 🔻)
11458/14527
🔴 Branches
57.72% (+0.03% 🔼)
2691/4662
🟡 Functions
65.77% (-0.01% 🔻)
1831/2784
🟢 Lines
80.21% (-0.02% 🔻)
10328/12876
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🟢
... / index.tsx
82.35% (-8.82% 🔻)
66.67% (-16.67% 🔻)
50% (-12.5% 🔻)
83.87% (-9.68% 🔻)

Test suite run success

1440 tests passing in 201 suites.

Report generated by 🧪jest coverage report action from d7d1d40

@compojoom compojoom merged commit 450496b into feat-cow-swap May 3, 2024
14 checks passed
@compojoom compojoom deleted the fix-surplus branch May 3, 2024 12:49
@github-actions github-actions bot locked and limited conversation to collaborators May 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants