aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/confirm-page-container
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@users.noreply.github.com>2018-08-29 08:37:13 +0800
committerGitHub <noreply@github.com>2018-08-29 08:37:13 +0800
commit9ab0354e36a1598677bf9c0f685ce60c58e5f770 (patch)
tree26a60d60efe233dbe8b6020e0dce76a629eb1483 /ui/app/components/confirm-page-container
parent4560df6e739b97caf95ef5bc5bc93f91e8c890bb (diff)
parentf78dc96a2c39aa8254317d57691ebd4294e7ad2d (diff)
downloadtangerine-wallet-browser-9ab0354e36a1598677bf9c0f685ce60c58e5f770.tar.gz
tangerine-wallet-browser-9ab0354e36a1598677bf9c0f685ce60c58e5f770.tar.zst
tangerine-wallet-browser-9ab0354e36a1598677bf9c0f685ce60c58e5f770.zip
Merge pull request #5155 from MetaMask/i5154-confirm-spinner
Fix infinite spinner on failed transactions
Diffstat (limited to 'ui/app/components/confirm-page-container')
-rw-r--r--ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js4
-rw-r--r--ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss8
2 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
index 70ebdeb20..4965d7b4e 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
+++ b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/confirm-page-container-error.component.js
@@ -11,7 +11,9 @@ const ConfirmPageContainerError = (props, context) => {
src="/images/alert-red.svg"
className="confirm-page-container-error__icon"
/>
- { `ALERT: ${error}` }
+ <div className="confirm-page-container-error__text">
+ { `ALERT: ${error}` }
+ </div>
</div>
)
}
diff --git a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
index e99b0f631..89ff25578 100644
--- a/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
+++ b/ui/app/components/confirm-page-container/confirm-page-container-content/confirm-page-container-error/index.scss
@@ -1,5 +1,5 @@
.confirm-page-container-error {
- height: 32px;
+ min-height: 32px;
border: 1px solid $monzo;
color: $monzo;
background: lighten($monzo, 56%);
@@ -8,10 +8,14 @@
display: flex;
justify-content: flex-start;
align-items: center;
- padding-left: 16px;
+ padding: 8px 16px;
&__icon {
margin-right: 8px;
flex: 0 0 auto;
}
+
+ &__text {
+ overflow: auto;
+ }
}