-
Notifications
You must be signed in to change notification settings - Fork 2
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
Don't open the wallet window after closing deposit flow #877
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
680a26e
FIx the wallet window opening
kkosiorowska 2c56e9b
Do not close the Stake modal on esc button
kkosiorowska eee034b
Cancel withdrawal/deposit
kkosiorowska ccd7755
Merge branch 'main' into fix-wallet-window
kkosiorowska fffdb6d
Make sure the `shouldOpenErrorModal` is updated
kkosiorowska d196200
Use current session data to check promise state
kkosiorowska e3fd7ec
Merge branch 'main' of github.com:thesis/acre into fix-wallet-window
kkosiorowska 1ff365d
Merge branch 'main' into fix-wallet-window
r-czajkowski File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like we can hide the const sessionId = ... //generate session here
... // Implementation here
return {
cancel,
resolve,
options: { shouldOpenErrorModal: false }
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import { useCallback, useEffect } from "react" | ||
|
||
const sessionIdToPromise: Record< | ||
number, | ||
{ | ||
promise: Promise<void> | ||
cancel: (reason: Error) => void | ||
shouldOpenErrorModal: boolean | ||
} | ||
> = {} | ||
|
||
export default function useCancelPromise( | ||
sessionId: number, | ||
errorMsgText: string, | ||
) { | ||
useEffect(() => { | ||
let cancel = (_: Error) => {} | ||
const promise: Promise<void> = new Promise((_, reject) => { | ||
cancel = reject | ||
}) | ||
|
||
sessionIdToPromise[sessionId] = { | ||
cancel, | ||
promise, | ||
shouldOpenErrorModal: true, | ||
} | ||
}, [sessionId]) | ||
|
||
const cancel = useCallback(() => { | ||
const sessionData = sessionIdToPromise[sessionId] | ||
sessionIdToPromise[sessionId] = { | ||
...sessionData, | ||
shouldOpenErrorModal: false, | ||
} | ||
|
||
sessionIdToPromise[sessionId].cancel(new Error(errorMsgText)) | ||
}, [errorMsgText, sessionId]) | ||
|
||
const resolve = useCallback( | ||
() => | ||
Promise.race([sessionIdToPromise[sessionId].promise, Promise.resolve()]), | ||
[sessionId], | ||
) | ||
|
||
return { | ||
cancel, | ||
resolve, | ||
sessionIdToPromise, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can generate sessionId inside
useCancelPromise
hook?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously I used this solution but had the problem that
shouldOpenErrorModal
was not returning the correct value for the right session.Steps to reproduce:
The problem was that the wallet window appeared and the dApp displayed a modal error. This happened because
shouldOpenErrorModal
was true. Hook didn't return the right value for the session.I decided to pass
sessionId
to the hook to make sure we get the right value forshouldOpenErrorModal
. This solution solved the problem.