fix: highlight confirmed status when signer confirms #2279

iamacook · 2023-07-12T14:04:18Z

What it solves

Resolves confirmed status incorrectly highlighted

How this PR fixes it

The transaction status "Confirmed" step is now only highlighted if the user will confirm the transaction with their signature.

How to test it

Create a transaction on a 1/n Safe and observe the "Confirmed" status highlighted.
Create a transaction with an 1+/n Safe and observe the "Confirmed" status highlighted when the threshold - 1 user confirms/executes the transaction.

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

* feat: Add StepperFactory, new tx pages * wip: context instead of routes * Add tx flows to new modal context * fix: Close modal when user navigates * Export all flows from one file * refactor: Remove unused code from StepperFactory * fix: Duplicate ModalDialog to fix failing tests

* Refactor: reactive recommended nonce Reduce re-renders Nonce -1 * Use "nonceReadyOnly" instead of -1 * Split sign and execute into two components

* feat: add tx status widget UI * add logic to paint the stepper * port the ConfirmProposedTx to the new layout * pass tx data to the TxStatusWidget to get the tx confirmations * style: add new lines between adjacent tags

* Refactor: SafeTxProvider * Avoid oscillating nonce * fix reject tx for new provider --------- Co-authored-by: Usame Algan <[email protected]>

* Refactor: useRecommendedNonce + useSafeTxGas * Fix lint * Get recommended nonce by "estimating" an empty tx

* Refactor: a less verbose ModalProvider * Fix Cannot redefine property: dispatchTxProposal

* Refactor the tx flow system * Array

* Editable nonce * Fix tests

* fix: Close modal on sign, only render current step * fix: Close modal on sign, only render current step * fix: set all data + move back button --------- Co-authored-by: Usame Algan <[email protected]>

* Refactor: single type for tx flows * Omit txNonce * FormData type

* feat: Port change threshold flow * fix: Only estimate gas when executing * fix: Remove old component

* feat: add owner flow * feat: replace owner flow * feat: replace owner flow

* SafeAppsTx flow * On close * Handle txFlow close

* feat: new spending limit flow * fix: preserve token address + reset time values

* fix: Check execute checkbox if execution is the only option (#2230) * v1.14.0 * Chore: escape quotes in release action (#2236) Use printf Use a heredoc Use jq * fix: only initiate WC v2 module if project id provided (#2228) * chore: mark `NEXT_PUBLIC_WC_PROJECT_ID` required * chore: don't prettify * fix: don't return module * fix: revert readme * fix: autoconnect to WC v2 on mobile (#2238) * fix: update token price tooltip (#2257) --------- Co-authored-by: katspaugh <[email protected]> Co-authored-by: katspaugh <[email protected]> Co-authored-by: Aaron Cook <[email protected]>

* fix: Hide status for batch execute * fix: Close batch execute flow when submitting tx * fix: Remove hide status flag, add isBatch flag and display different status messages for batch execution

* fix: Hide approval editor for non-approval transactions * fix: Adjust useApprovalInfos hook for non-approval txs

* fix: increase `min-width` of nonce field * fix: prevent recommended nonce jump

* fix: Align decoded tx ui for batch execute * fix: Don't show confirmation dialog for batch execute, update spending limit components to use SendAmountBlock

* fix: Validation for spending limits * fix: Reset amount field to empty string instead of 0 when switching tokens * fix: Add readonly addressbook input to spending limits

* fix: Hide nonce for spending limit txs * Update src/components/tx-flow/flows/TokenTransfer/ReviewSpendingLimitTx.tsx Co-authored-by: Aaron Cook <[email protected]> --------- Co-authored-by: Aaron Cook <[email protected]>

github-actions · 2023-07-12T14:04:38Z

Branch preview

✅ Deploy successful!

https://confirmed_status--walletweb.review-wallet-web.5afe.dev

github-actions · 2023-07-12T14:07:31Z

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}

…to confirmed-status

francovenica · 2023-07-13T01:22:59Z

LGTM. The confirm status looks fine

usame-algan and others added 30 commits May 23, 2023 12:04

Add folder structure for tx flow

00f0e11

feat: create new-tx route and NewTxMenu component

92efde1

Refactor: reactive recommended nonce (#2050)

6387992

* Refactor: reactive recommended nonce Reduce re-renders Nonce -1 * Use "nonceReadyOnly" instead of -1 * Split sign and execute into two components

Merge dev

a2a2933

feat: Transaction status widget (#2062)

50ab68c

* feat: add tx status widget UI * add logic to paint the stepper * port the ConfirmProposedTx to the new layout * pass tx data to the TxStatusWidget to get the tx confirmations * style: add new lines between adjacent tags

Refactor: SafeTxProvider (#2064)

5e8476d

* Refactor: SafeTxProvider * Avoid oscillating nonce * fix reject tx for new provider --------- Co-authored-by: Usame Algan <[email protected]>

Move progress to TxLayout

a4c362c

Refactor: useRecommendedNonce + useSafeTxGas (#2066)

1152232

* Refactor: useRecommendedNonce + useSafeTxGas * Fix lint * Get recommended nonce by "estimating" an empty tx

Merge dev

50f58d7

Adjust ConfirmTx and ExecuteTxButton

72a126d

Refactor: a less verbose ModalProvider (#2068)

603a6d2

* Refactor: a less verbose ModalProvider * Fix Cannot redefine property: dispatchTxProposal

Refactor the tx flow system (#2071)

0bd24db

* Refactor the tx flow system * Array

Fix: pass nonce correctly (#2072)

c810ad3

Fix linting errors, add TODOs for failing tx flows (#2070)

8d74bfc

Merge dev

61cf1b5

Editable nonce (#2077)

1362202

* Editable nonce * Fix tests

refactor: save entire data structure on submission (#2083)

1b63a8f

* fix: Close modal on sign, only render current step * fix: Close modal on sign, only render current step * fix: set all data + move back button --------- Co-authored-by: Usame Algan <[email protected]>

feat: Add SuccessScreen to tx flow (#2080)

6f51b42

Refactor: single type for tx flows (#2084)

2e8a049

* Refactor: single type for tx flows * Omit txNonce * FormData type

feat: add owner flow (#2086)

b966ab5

feat: Change threshold flow (#2085)

eb1731e

* feat: Port change threshold flow * fix: Only estimate gas when executing * fix: Remove old component

feat: remove owner flow

3afdea1

feat: replace owner flow (#2087)

f0c63ef

* feat: add owner flow * feat: replace owner flow * feat: replace owner flow

feat: update flow (#2089)

5b5c261

fix: Remove Module tx flow (#2090)

f4c6b86

Add flow for remove guard (#2091)

53c7df3

Safe Apps tx flow (#2081)

60ce628

* SafeAppsTx flow * On close * Handle txFlow close

feat: new spending limit flow (#2093)

d69cd67

* feat: new spending limit flow * fix: preserve token address + reset time values

Onclose callback (#2094)

83d5e8f

usame-algan and others added 15 commits July 10, 2023 18:09

fix: Review send NFT view (#2263)

089e287

Merge branch 'dev' into epic-tx-flow

db76669

[TX flow] Batch execute fixes (#2268)

6d6859e

* fix: Hide status for batch execute * fix: Close batch execute flow when submitting tx * fix: Remove hide status flag, add isBatch flag and display different status messages for batch execution

fix: remove unnecessary hook (#2271)

21878ba

fix: Sticky close button (#2269)

57c053f

fix: Hide approval editor for non-approval transactions (#2262)

9792587

* fix: Hide approval editor for non-approval transactions * fix: Adjust useApprovalInfos hook for non-approval txs

Merge branch 'dev' into epic-tx-flow

cbf8119

fix: Adjust tx flow elements height (#2272)

62c740d

fix: increase min-width of nonce field (#2270)

da39b3d

* fix: increase `min-width` of nonce field * fix: prevent recommended nonce jump

fix: align progress bar with new tx button (#2274)

d2113f3

fix: Align decoded tx ui for batch execute (#2275)

f487649

* fix: Align decoded tx ui for batch execute * fix: Don't show confirmation dialog for batch execute, update spending limit components to use SendAmountBlock

fix: Validation for spending limits (#2277)

cbb24e3

* fix: Validation for spending limits * fix: Reset amount field to empty string instead of 0 when switching tokens * fix: Add readonly addressbook input to spending limits

fix: Hide nonce for spending limit txs (#2278)

5ceda2e

* fix: Hide nonce for spending limit txs * Update src/components/tx-flow/flows/TokenTransfer/ReviewSpendingLimitTx.tsx Co-authored-by: Aaron Cook <[email protected]> --------- Co-authored-by: Aaron Cook <[email protected]>

fix: highlight confirmed status when signer confirms

476f865

iamacook requested a review from usame-algan July 12, 2023 14:04

iamacook self-assigned this Jul 12, 2023

fix: Remove step check for confirm highlight

66fa81e

usame-algan approved these changes Jul 12, 2023

View reviewed changes

iamacook changed the base branch from epic-tx-flow to dev July 12, 2023 14:39

iamacook and others added 4 commits July 12, 2023 16:40

Merge branch 'dev' into confirmed-status

a0eed9f

fix: highlight confirmed status when signer confirms

53473b7

Merge branch 'confirmed-status' of github.com:safe-global/web-core in…

b0a45e7

…to confirmed-status

chore: Update version to 1.15.0

264824e

usame-algan merged commit 27ffdd7 into dev Jul 12, 2023
6 of 7 checks passed

usame-algan deleted the confirmed-status branch July 12, 2023 19:50

github-actions bot locked and limited conversation to collaborators Jul 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: highlight confirmed status when signer confirms #2279

fix: highlight confirmed status when signer confirms #2279

iamacook commented Jul 12, 2023

github-actions bot commented Jul 12, 2023 •

edited

Loading

github-actions bot commented Jul 12, 2023 •

edited

Loading

francovenica commented Jul 13, 2023

fix: highlight confirmed status when signer confirms #2279

fix: highlight confirmed status when signer confirms #2279

Conversation

iamacook commented Jul 12, 2023

What it solves

How this PR fixes it

How to test it

Checklist

github-actions bot commented Jul 12, 2023 • edited Loading

Branch preview

github-actions bot commented Jul 12, 2023 • edited Loading

ESLint Summary View Full Report

francovenica commented Jul 13, 2023

github-actions bot commented Jul 12, 2023 •

edited

Loading

github-actions bot commented Jul 12, 2023 •

edited

Loading