fix: allow cancellation after expiration #2902
Conversation
Branch preview✅ Deploy successful! https://recovery_cancel_period--walletweb.review-wallet-web.5afe.dev |
| @@ -32,7 +32,7 @@ const headCells = [ | |||
| label: ( | |||
| <> | |||
| Recovery delay{' '} | |||
| <Tooltip title="You can cancel any recovery attempt when it is not needed or wanted within the delay period."> | |||
| <Tooltip title="You can cancel any recovery attempt when it is not needed or wanted."> | |||
There was a problem hiding this comment.
We should extract these to a constant as they are the same throughout the app but I'd suggest so in a separate PR to avoid inflating the scope of this.
ESLint Summary View Full Report
Report generated by eslint-plus-action |
📦 Next.js Bundle Analysis for safe-wallet-webThis analysis was generated by the Next.js Bundle Analysis action. 🤖
|
| Page | Size (compressed) |
|---|---|
global |
1.52 MB (🟡 +8.41 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!
Twenty-nine Pages Changed Size
The following pages changed size from the code in this PR compared to its base branch:
| Page | Size (compressed) | First Load |
|---|---|---|
/addOwner |
3.5 KB (🟢 -20 B) |
1.52 MB |
/apps |
34.59 KB (🟢 -240 B) |
1.55 MB |
/apps/custom |
27.12 KB (🟢 -239 B) |
1.55 MB |
/apps/open |
26.78 KB (🟡 +59 B) |
1.55 MB |
/balances |
26.52 KB (🔴 +5.7 KB) |
1.55 MB |
/balances/nfts |
18.68 KB (🟡 +47 B) |
1.54 MB |
/cookie |
8.88 KB (🔴 +2.56 KB) |
1.53 MB |
/home |
39.95 KB (🔴 +13.06 KB) |
1.56 MB |
/imprint |
1.41 KB (🟢 -14 B) |
1.52 MB |
/licenses |
5.13 KB (🟢 -15 B) |
1.53 MB |
/new-safe/create |
11.83 KB (🟡 +8 B) |
1.53 MB |
/privacy |
15.87 KB (🔴 +3.19 KB) |
1.54 MB |
/settings/appearance |
8.36 KB (🟢 -167 B) |
1.53 MB |
/settings/cookies |
7.59 KB (🟢 -177 B) |
1.53 MB |
/settings/data |
7.49 KB (🟢 -176 B) |
1.53 MB |
/settings/environment-variables |
8.8 KB (🟢 -165 B) |
1.53 MB |
/settings/modules |
13.23 KB (🔴 +3.39 KB) |
1.53 MB |
/settings/notifications |
11.15 KB (🟢 -120 B) |
1.53 MB |
/settings/safe-apps |
12.11 KB (🟢 -162 B) |
1.53 MB |
/settings/security-login |
39.8 KB (🔴 +25.43 KB) |
1.56 MB |
/settings/setup |
24.06 KB (🟢 -75 B) |
1.54 MB |
/terms |
10.06 KB (🟢 -17 B) |
1.53 MB |
/transactions |
52.49 KB (🟡 +21 B) |
1.57 MB |
/transactions/history |
52.46 KB (🟡 +21 B) |
1.57 MB |
/transactions/messages |
18.59 KB (🟡 +2 B) |
1.54 MB |
/transactions/queue |
26 KB (🔴 +6.89 KB) |
1.55 MB |
/transactions/tx |
6.26 KB (🟡 +2 B) |
1.53 MB |
/welcome |
7.13 KB (🟢 -1 B) |
1.53 MB |
/welcome/social-login |
7.57 KB (🟡 +1 B) |
1.53 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.
Coverage report
Show files with reduced coverage 🔻
Test suite run success1225 tests passing in 172 suites. Report generated by 🧪jest coverage report action from 6c7fca8 |
| @@ -55,7 +55,7 @@ export function CancelRecoveryButton({ | |||
| return ( | |||
| <CheckWallet allowNonOwner> | |||
| {(isOk) => { | |||
| const isDisabled = !isOk || (isGuardian && !isExpired) | |||
| const isDisabled = isOwner ? !isOk : !isOk && !isExpired | |||
There was a problem hiding this comment.
This makes it possible to cancel a recovery tx as a non-owner before it has expired. I assume that tx would fail so I suggest to still disable it.
There was a problem hiding this comment.
I've tweaked the logic in 6c7fca8 to only disable if not expired as non-owners are able to skip expired transactions
What it solves
Resolves ability to cancel recovery attempts after expiration
How this PR fixes it
The disable logic has been altered to only take the expiration into account when not connected as an owner, as well as adjusting the information about cancellation throughout the app.
How to test it
Observe cancellation is always possible as an owner, wheras if not an owner only after expiration.
Checklist