Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

fix: return after rejecting an off-chain transaction #3356

Merged
merged 1 commit into from Jan 24, 2022

Conversation

iamacook
Copy link
Member

What it solves

Resolves #3355

How this PR fixes it

When a user rejects a transaction, the onlyConfirm function throws and it was not returning. An on-chain transaction was then being attempted.

A created, but not immediately executed transaction now returns after an error is thrown.

How to test it

  1. Attempt to queue/confirm a transaction but reject it via MM.
  2. Observe that no second MM popup is displayed.

@github-actions
Copy link

CLA Assistant Lite All Contributors have signed the CLA.

@github-actions
Copy link

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

@coveralls
Copy link

Pull Request Test Coverage Report for Build 1739209074

  • 0 of 1 (0.0%) changed or added relevant line in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage remained the same at 32.361%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/logic/safe/store/actions/createTransaction.ts 0 1 0.0%
Files with Coverage Reduction New Missed Lines %
src/logic/safe/store/actions/createTransaction.ts 1 3.03%
Totals Coverage Status
Change from base Build 1735787251: 0.0%
Covered Lines: 3172
Relevant Lines: 8715

💛 - Coveralls

@github-actions
Copy link

Deployment links

🟠 Rinkeby Mainnet 🟣 Polygon 🟡 BSC Arbitrum 🟢 Gnosis Chain

@github-actions
Copy link

github-actions bot commented Jan 24, 2022

E2E Tests Failed
Check the results here: https://github.com/gnosis/safe-react-e2e-tests/actions/runs/1739245716

Failed tests:

  • ❌ Address book Address book
  • ❌ Safe Apps List Safe Apps List
  • ❌ Read-only transaction creation and review Read-only transaction creation and review

Copy link
Member

@katspaugh katspaugh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I having a deja vu? I thought this was fixed already.

@iamacook
Copy link
Member Author

Am I having a deja vu? I thought this was fixed already.

I think there was some merge conflicts that resulted in this.

@francovenica
Copy link
Contributor

Same, I thought we fixed this already. Well, is working fine in the PR. Tested with safes 1, 2 and 3/x, checking that rejecting off-chain type of signatures don't open a new pop up. Tested also with rejections.

Looks good to me

@iamacook iamacook merged commit 7793a8b into dev Jan 24, 2022
@iamacook iamacook deleted the second-rejection-popup branch January 24, 2022 12:53
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2022
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.

Rejecting an off-chain signature displays a second on-chain request window
4 participants