mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-22 17:33:23 +01:00
Fix styling on confirm-send-ether and confirm-send-token (#3600)
This commit is contained in:
parent
3bc8493166
commit
4512243290
@ -167,7 +167,7 @@ async function runSendFlowTest(assert, done) {
|
|||||||
// TODO: Need a way to mock background so that we can test correct transition from editing to confirm
|
// TODO: Need a way to mock background so that we can test correct transition from editing to confirm
|
||||||
selectState.val('confirm new ui')
|
selectState.val('confirm new ui')
|
||||||
reactTriggerChange(selectState[0])
|
reactTriggerChange(selectState[0])
|
||||||
const confirmScreenConfirmButton = await queryAsync($, '.confirm-screen-confirm-button')
|
const confirmScreenConfirmButton = await queryAsync($, '.btn-confirm.page-container__footer-button')
|
||||||
console.log(`+++++++++++++++++++++++++++++++= confirmScreenConfirmButton[0]`, confirmScreenConfirmButton[0]);
|
console.log(`+++++++++++++++++++++++++++++++= confirmScreenConfirmButton[0]`, confirmScreenConfirmButton[0]);
|
||||||
confirmScreenConfirmButton[0].click()
|
confirmScreenConfirmButton[0].click()
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ class ConfirmDeployContract extends Component {
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
h('form#pending-tx-form', {
|
h('form#pending-tx-form', {
|
||||||
onClick: event => this.onSubmit(event),
|
onSubmit: event => this.onSubmit(event),
|
||||||
}, [
|
}, [
|
||||||
h('.page-container__footer', [
|
h('.page-container__footer', [
|
||||||
// Cancel Button
|
// Cancel Button
|
||||||
|
@ -224,6 +224,7 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
h('div.page-container__title', 'Confirm'),
|
h('div.page-container__title', 'Confirm'),
|
||||||
h('div.page-container__subtitle', `Please review your transaction.`),
|
h('div.page-container__subtitle', `Please review your transaction.`),
|
||||||
]),
|
]),
|
||||||
|
h('.page-container__content', [
|
||||||
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
||||||
h('div.confirm-screen-account-wrapper', [
|
h('div.confirm-screen-account-wrapper', [
|
||||||
h(
|
h(
|
||||||
@ -292,7 +293,7 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
|
|
||||||
h('section.flex-row.flex-center.confirm-screen-total-box ', [
|
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
|
||||||
h('div.confirm-screen-section-column', [
|
h('div.confirm-screen-section-column', [
|
||||||
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
||||||
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
||||||
@ -389,8 +390,9 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
h('form#pending-tx-form', {
|
h('form#pending-tx-form', {
|
||||||
onSubmit: this.onSubmit,
|
onSubmit: this.onSubmit,
|
||||||
}, [
|
}, [
|
||||||
|
h('.page-container__footer', [
|
||||||
// Cancel Button
|
// Cancel Button
|
||||||
h('div.cancel.btn-light.confirm-screen-cancel-button.allcaps', {
|
h('button.btn-cancel.page-container__footer-button.allcaps', {
|
||||||
onClick: (event) => {
|
onClick: (event) => {
|
||||||
clearSend()
|
clearSend()
|
||||||
this.cancel(event, txMeta)
|
this.cancel(event, txMeta)
|
||||||
@ -398,7 +400,9 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
}, t('cancel')),
|
}, t('cancel')),
|
||||||
|
|
||||||
// Accept Button
|
// Accept Button
|
||||||
h('button.confirm-screen-confirm-button.allcaps', [t('confirm')]),
|
h('button.btn-confirm.page-container__footer-button.allcaps', [t('confirm')]),
|
||||||
|
]),
|
||||||
|
]),
|
||||||
]),
|
]),
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
|
@ -265,7 +265,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
|
|||||||
|
|
||||||
return fiatAmount && fiatGas
|
return fiatAmount && fiatGas
|
||||||
? (
|
? (
|
||||||
h('section.flex-row.flex-center.confirm-screen-total-box ', [
|
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
|
||||||
h('div.confirm-screen-section-column', [
|
h('div.confirm-screen-section-column', [
|
||||||
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
||||||
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
||||||
@ -278,7 +278,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
|
|||||||
])
|
])
|
||||||
)
|
)
|
||||||
: (
|
: (
|
||||||
h('section.flex-row.flex-center.confirm-screen-total-box ', [
|
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
|
||||||
h('div.confirm-screen-section-column', [
|
h('div.confirm-screen-section-column', [
|
||||||
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
h('span.confirm-screen-label', [ t('total') + ' ' ]),
|
||||||
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]),
|
||||||
@ -319,6 +319,7 @@ ConfirmSendToken.prototype.render = function () {
|
|||||||
h('div.page-container__title', t('confirm')),
|
h('div.page-container__title', t('confirm')),
|
||||||
h('div.page-container__subtitle', t('pleaseReviewTransaction')),
|
h('div.page-container__subtitle', t('pleaseReviewTransaction')),
|
||||||
]),
|
]),
|
||||||
|
h('.page-container__content', [
|
||||||
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
||||||
h('div.confirm-screen-account-wrapper', [
|
h('div.confirm-screen-account-wrapper', [
|
||||||
h(
|
h(
|
||||||
@ -378,21 +379,22 @@ ConfirmSendToken.prototype.render = function () {
|
|||||||
this.renderTotalPlusGas(),
|
this.renderTotalPlusGas(),
|
||||||
|
|
||||||
]),
|
]),
|
||||||
]),
|
|
||||||
|
|
||||||
|
]),
|
||||||
h('form#pending-tx-form', {
|
h('form#pending-tx-form', {
|
||||||
onSubmit: this.onSubmit,
|
onSubmit: this.onSubmit,
|
||||||
}, [
|
}, [
|
||||||
|
h('.page-container__footer', [
|
||||||
// Cancel Button
|
// Cancel Button
|
||||||
h('div.cancel.btn-light.confirm-screen-cancel-button.allcaps', {
|
h('button.btn-cancel.page-container__footer-button.allcaps', {
|
||||||
onClick: (event) => this.cancel(event, txMeta),
|
onClick: (event) => this.cancel(event, txMeta),
|
||||||
}, t('cancel')),
|
}, t('cancel')),
|
||||||
|
|
||||||
// Accept Button
|
// Accept Button
|
||||||
h('button.confirm-screen-confirm-button.allcaps', [t('confirm')]),
|
h('button.btn-confirm.page-container__footer-button.allcaps', [t('confirm')]),
|
||||||
|
]),
|
||||||
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user