aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/app/conf-tx.js18
-rw-r--r--ui/app/css/itcss/components/confirm.scss16
-rw-r--r--ui/app/css/itcss/components/transaction-list.scss2
3 files changed, 35 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index b4ffc48b7..1070436c3 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -40,6 +40,7 @@ function mapStateToProps (state) {
currentCurrency: state.metamask.currentCurrency,
blockGasLimit: state.metamask.currentBlockGasLimit,
computedBalances: state.metamask.computedBalances,
+ selectedAddressTxList: state.metamask.selectedAddressTxList,
}
}
@@ -48,6 +49,23 @@ function ConfirmTxScreen () {
Component.call(this)
}
+ConfirmTxScreen.prototype.componentDidUpdate = function (prevProps) {
+ const {
+ unapprovedTxs,
+ network,
+ selectedAddressTxList,
+ } = this.props
+ const { index: prevIndex, unapprovedTxs: prevUnapprovedTxs } = prevProps
+ const prevUnconfTxList = txHelper(prevUnapprovedTxs, {}, {}, {}, network)
+ const prevTxData = prevUnconfTxList[prevIndex] || {}
+ const prevTx = selectedAddressTxList.find(({ id }) => id === prevTxData.id) || {}
+ const unconfTxList = txHelper(unapprovedTxs, {}, {}, {}, network)
+
+ if (prevTx.status === 'dropped' && unconfTxList.length === 0) {
+ this.goHome({})
+ }
+}
+
ConfirmTxScreen.prototype.render = function () {
const props = this.props
const {
diff --git a/ui/app/css/itcss/components/confirm.scss b/ui/app/css/itcss/components/confirm.scss
index 1977b49ae..abe138f54 100644
--- a/ui/app/css/itcss/components/confirm.scss
+++ b/ui/app/css/itcss/components/confirm.scss
@@ -242,6 +242,22 @@ section .confirm-screen-account-number,
}
}
+@media screen and (max-width: 379px) {
+ .confirm-screen-row {
+ span.confirm-screen-section-column {
+ flex: 0.4;
+ }
+
+ div.confirm-screen-section-column {
+ flex: 0.6;
+ }
+
+ .currency-display__input {
+ font-size: 14px;
+ }
+ }
+}
+
.confirm-screen-row-detail {
font-size: 12px;
line-height: 16px;
diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss
index c13f24953..d03faf486 100644
--- a/ui/app/css/itcss/components/transaction-list.scss
+++ b/ui/app/css/itcss/components/transaction-list.scss
@@ -170,6 +170,7 @@
@media screen and (max-width: 379px) {
margin-left: 0px;
+ text-align: center;
}
}
@@ -244,7 +245,6 @@
}
.tx-list-item {
- height: 80px;
border-top: 1px solid rgb(231, 231, 231);
flex: 0 0 auto;
display: flex;