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: Disable execute button for expired swaps #3650

Merged
merged 2 commits into from
May 3, 2024

Conversation

usame-algan
Copy link
Member

@usame-algan usame-algan commented May 3, 2024

What it solves

Follow-up on Notion issue

The swap buttons were only disabled after the first interval passed (10s) but they should be disabled immediately.

How this PR fixes it

  • Runs the callback function passed to useInterval on mount instead of waiting for the first interval
  • Additionally checks the txInfo for an expired status

How to test it

  1. Create and queue a swap
  2. Let it expire
  3. Navigate to a different page and navigate back to the queue
  4. Observe the Execute button becomes disabled immediately
  5. Create and execute a swap
  6. Go to the history
  7. Observe no expired status
  8. Create and execute a limit order that can only be partially filled
  9. Go to the history
  10. Observe an expired status

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) 🧑‍💻

@usame-algan usame-algan requested a review from compojoom May 3, 2024 09:49
Copy link

github-actions bot commented May 3, 2024

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.61 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.04 KB (🟡 +9.96 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.32 KB (🟡 +5.71 KB) 1.09 MB
/transactions/history 107.29 KB (🟡 +5.71 KB) 1.09 MB
/transactions/messages 67.08 KB (🟡 +5.71 KB) 1.05 MB
/transactions/queue 62.74 KB (🟡 +5.71 KB) 1.05 MB
/transactions/tx 52.09 KB (🟡 +5.71 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

Caution

Test run failed

St.
Category Percentage Covered / Total
🟡 Statements
78.88% (+0.02% 🔼)
11457/14524
🔴 Branches
57.66% (-0% 🔻)
2686/4658
🟡 Functions
65.78% (+0.04% 🔼)
1830/2782
🟢 Lines
80.21% (+0.01% 🔼)
10326/12873

Test suite run failed

Failed tests: 1/1439. Failed suites: 1/201.
  ● AddressInput tests › should not show the adornment prefix when the value contains correct prefix

    expect(received).toBe(expected) // Object.is equality

    Expected: ""
    Received: "wide-eyed:"

    Ignored nodes: comments, script, style
    <html>
      <head />
      <body>
        <div>
          <form>
            <div
              class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root input css-wb57ya-MuiFormControl-root-MuiTextField-root"
              spellcheck="false"
            >
              <label
                class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined MuiFormLabel-colorPrimary Mui-error MuiFormLabel-filled MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeMedium MuiInputLabel-outlined css-18pzvfc-MuiFormLabel-root-MuiInputLabel-root"
                data-shrink="true"
                for=":r9:"
                id=":r9:-label"
              >
                "eyed" doesn't match the current chain
              </label>
              <div
                class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary Mui-error MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedStart MuiInputBase-adornedEnd css-16549ak-MuiInputBase-root-MuiOutlinedInput-root"
              >
                <div
                  class="MuiInputAdornment-root MuiInputAdornment-positionEnd MuiInputAdornment-outlined MuiInputAdornment-sizeMedium css-s8hmf8-MuiInputAdornment-root"
                >
                  <span
                    class="MuiSkeleton-root MuiSkeleton-circular css-lnz7yn-MuiSkeleton-root"
                    style="width: 32px; height: 32px;"
                  />
                  wide-eyed
                  :
                </div>
                <input
                  aria-invalid="true"
                  autocomplete="off"
                  class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputAdornedStart MuiInputBase-inputAdornedEnd css-1qiaqwv-MuiInputBase-input-MuiOutlinedInput-input"
                  id=":r9:"
                  name="recipient"
                  type="text"
                  value="eyed:0x0000000000000000000000000000000000000001"
                />
                <div
                  class="MuiInputAdornment-root MuiInputAdornment-positionEnd MuiInputAdornment-outlined MuiInputAdornment-sizeMedium css-1laqsz7-MuiInputAdornment-root"
                />
                <fieldset
                  aria-hidden="true"
                  class="MuiOutlinedInput-notchedOutline css-p7vjcx-MuiOutlinedInput-notchedOutline"
                >
                  <legend
                    class="css-14lo706"
                  >
                    <span>
                      "eyed" doesn't match the current chain
                    </span>
                  </legend>
                </fieldset>
              </div>
            </div>
            <button
              type="submit"
            >
              Submit
            </button>
          </form>
        </div>
      </body>
    </html>

      229 |     })
      230 |
    > 231 |     await waitFor(() => expect(input.previousElementSibling?.textContent).toBe(''))
          |                                                                           ^
      232 |   })
      233 |
      234 |   it('should keep a bare address in the form state', async () => {

      at toBe (src/components/common/AddressInput/index.test.tsx:231:75)
      at runWithExpensiveErrorDiagnosticsDisabled (node_modules/@testing-library/dom/dist/config.js:47:12)
      at checkCallback (node_modules/@testing-library/dom/dist/wait-for.js:127:77)
      at node_modules/@testing-library/dom/dist/wait-for.js:70:9

Report generated by 🧪jest coverage report action from 364e9a6

@usame-algan usame-algan requested review from schmanu and compojoom and removed request for compojoom May 3, 2024 11:48
@compojoom compojoom merged commit a1b6bb2 into feat-cow-swap May 3, 2024
12 of 14 checks passed
@compojoom compojoom deleted the disable-expired-swap branch May 3, 2024 15:18
@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