Convert all remaining Modals to use Portal (UI consistency) (#4625)
* FirstRun dialog -> Portal * CreateAccount Modal -> Portal * CreateWallet dialog -> Portal * Transfer dialog -> Portal * Fix failing tests * ShapeShift dialog -> Portal * Verification dialog -> Portal * EditMeta dialog -> Portal * PasswordManager dialog -> Portal * WalletSettings dialog -> Portal * AddAddress dialog -> Portal * s/delete address/forget address/ * AddContract dialog -> Portal * DeployContract dialog -> Portal * ExceuteContract dialog -> Portal * LoadContract dialog -> Portal * SaveContract dialog -> Portal * UpgradeParity dialog -> Portal * Convert inline modals (tsk, tsk) * Remove ui/Modal * Import dialog i18n * Button array returns (thanks @derhuerst) * Unneeded debug * Typo * Readability formatting
This commit is contained in:
@@ -37,25 +37,23 @@
|
||||
}
|
||||
|
||||
.shapeshift {
|
||||
position: absolute;
|
||||
bottom: 0.5em;
|
||||
left: 1em;
|
||||
cursor: pointer;
|
||||
left: 1.5em;
|
||||
outline: none;
|
||||
}
|
||||
position: absolute;
|
||||
|
||||
.shapeshift img {
|
||||
height: 28px;
|
||||
img {
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
|
||||
.info, .busy {
|
||||
}
|
||||
|
||||
.center {
|
||||
}
|
||||
|
||||
.center div {
|
||||
text-align: center;
|
||||
div {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.error {
|
||||
@@ -74,9 +72,11 @@
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.price div {
|
||||
text-align: center;
|
||||
font-size: small;
|
||||
.price {
|
||||
div {
|
||||
text-align: center;
|
||||
font-size: small;
|
||||
}
|
||||
}
|
||||
|
||||
.empty {
|
||||
|
||||
@@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import shapeshiftLogo from '~/../assets/images/shapeshift-logo.png';
|
||||
import { Button, IdentityIcon, Modal } from '~/ui';
|
||||
import { Button, IdentityIcon, Portal } from '~/ui';
|
||||
import { CancelIcon, DoneIcon } from '~/ui/Icons';
|
||||
|
||||
import AwaitingDepositStep from './AwaitingDepositStep';
|
||||
@@ -81,9 +81,15 @@ export default class Shapeshift extends Component {
|
||||
const { error, stage } = this.store;
|
||||
|
||||
return (
|
||||
<Modal
|
||||
actions={ this.renderDialogActions() }
|
||||
current={ stage }
|
||||
<Portal
|
||||
activeStep={ stage }
|
||||
busySteps={ [
|
||||
STAGE_WAIT_DEPOSIT,
|
||||
STAGE_WAIT_EXCHANGE
|
||||
] }
|
||||
buttons={ this.renderDialogActions() }
|
||||
onClose={ this.onClose }
|
||||
open
|
||||
steps={
|
||||
error
|
||||
? null
|
||||
@@ -94,14 +100,9 @@ export default class Shapeshift extends Component {
|
||||
? ERROR_TITLE
|
||||
: null
|
||||
}
|
||||
visible
|
||||
waiting={ [
|
||||
STAGE_WAIT_DEPOSIT,
|
||||
STAGE_WAIT_EXCHANGE
|
||||
] }
|
||||
>
|
||||
{ this.renderPage() }
|
||||
</Modal>
|
||||
</Portal>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -110,13 +111,19 @@ export default class Shapeshift extends Component {
|
||||
const { coins, error, hasAcceptedTerms, stage } = this.store;
|
||||
|
||||
const logo = (
|
||||
<a href='http://shapeshift.io' target='_blank' className={ styles.shapeshift }>
|
||||
<a
|
||||
className={ styles.shapeshift }
|
||||
href='http://shapeshift.io'
|
||||
key='logo'
|
||||
target='_blank'
|
||||
>
|
||||
<img src={ shapeshiftLogo } />
|
||||
</a>
|
||||
);
|
||||
const cancelBtn = (
|
||||
<Button
|
||||
icon={ <CancelIcon /> }
|
||||
key='cancel'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='shapeshift.button.cancel'
|
||||
@@ -147,6 +154,7 @@ export default class Shapeshift extends Component {
|
||||
button
|
||||
/>
|
||||
}
|
||||
key='shift'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='shapeshift.button.shift'
|
||||
@@ -169,6 +177,7 @@ export default class Shapeshift extends Component {
|
||||
logo,
|
||||
<Button
|
||||
icon={ <DoneIcon /> }
|
||||
key='done'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='shapeshift.button.done'
|
||||
|
||||
Reference in New Issue
Block a user