m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Prevent redirecting to swaps in notification (#9497)

Browse Source 
If a notification popup was opened while the user was partway through
the swaps flow, the notification would display the swaps flow instead
of whatever action triggered the popup (e.g. a connect request or a
confirmation). This is confusing and potentially dangerous, as the
user might mistakenly think the swap was triggered by a dapp.

The swap redirects are now prevented in the notification UI. The user
will still be redirected to an in-progress swap flow if they open the
browser action popup or the fullscreen UI, but not on the notification
popup that is triggered by dapp actions.
This commit is contained in:
Mark Stacey 2020-10-07 13:49:47 -02:30 committed by GitHub
parent bf1bb6ca7e
commit d1e8f5db86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/app/pages/home/home.component.js
View File

@ -86,11 +86,11 @@ export default class Home extends PureComponent {
this.setState({ mounted: true }) this.setState({ mounted: true })
if (isNotification && totalUnapprovedCount === 0) { if (isNotification && totalUnapprovedCount === 0) {
global.platform.closeCurrentWindow() global.platform.closeCurrentWindow()
} else if (showAwaitingSwapScreen) { } else if (!isNotification && showAwaitingSwapScreen) {
history.push(AWAITING_SWAP_ROUTE) history.push(AWAITING_SWAP_ROUTE)
} else if (haveSwapsQuotes) { } else if (!isNotification && haveSwapsQuotes) {
history.push(VIEW_QUOTE_ROUTE) history.push(VIEW_QUOTE_ROUTE)
} else if (swapsFetchParams) { } else if (!isNotification && swapsFetchParams) {
history.push(BUILD_QUOTE_ROUTE) history.push(BUILD_QUOTE_ROUTE)
} else if (firstPermissionsRequestId) { } else if (firstPermissionsRequestId) {
history.push(`${CONNECT_ROUTE}/${firstPermissionsRequestId}`) history.push(`${CONNECT_ROUTE}/${firstPermissionsRequestId}`)
@ -117,7 +117,18 @@ export default class Home extends PureComponent {
if (!mounted) { if (!mounted) {
if (isNotification && totalUnapprovedCount === 0) { if (isNotification && totalUnapprovedCount === 0) {
return { closing: true } return { closing: true }
} else if (firstPermissionsRequestId || unconfirmedTransactionsCount > 0 || Object.keys(suggestedTokens).length > 0 || showAwaitingSwapScreen || haveSwapsQuotes || swapsFetchParams) { } else if (
firstPermissionsRequestId ||
unconfirmedTransactionsCount > 0 ||
Object.keys(suggestedTokens).length > 0 ||
(
!isNotification && (
showAwaitingSwapScreen ||
haveSwapsQuotes ||
swapsFetchParams
)
)
) {
return { redirecting: true } return { redirecting: true }
} }
} }