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

Display nothing during confirm page load (#8207)

Browse Source 
Previously a few mostly-empty `div`s would be shown if a render
happened while the confirm page was loading. Now nothing is shown. This
shouldn't impact users at all, as this condition should only last a
fraction of a second.
This commit is contained in:
Mark Stacey 2020-03-17 18:11:44 -03:00 committed by GitHub
parent 8ba35f673e
commit 23a4c62bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,10 @@ export default class Home extends PureComponent {
if (forgottenPassword) {
return <Redirect to={{ pathname: RESTORE_VAULT_ROUTE }} />
} else if (history.location.pathname.match(/^\/confirm-transaction/)) {
// This should only happen if this renders during the redirect to the confirm page
// Display nothing while the confirm page loads, to avoid side-effects of rendering normal home view
return null
}
return (
@ -174,21 +178,15 @@ export default class Home extends PureComponent {
(isWideViewport) => (
<>
{ isWideViewport ? <WalletView /> : null }
{
!history.location.pathname.match(/^\/confirm-transaction/)
? (
<div className="home__main-view">
{
!isWideViewport ? <MenuBar /> : null
}
<div className="home__balance-wrapper">
<TransactionViewBalance />
</div>
<TransactionList />
</div>
)
: null
}
<div className="home__main-view">
{
!isWideViewport ? <MenuBar /> : null
}
<div className="home__balance-wrapper">
<TransactionViewBalance />
</div>
<TransactionList />
</div>
</>
)
}