Skip to content

Add header prop on Modal #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 3 commits into from
Dec 9, 2019
Merged

Add header prop on Modal #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
373a3a9
Add header prop on Modal
jacogr Dec 9, 2019
516a46e
Bump API, fixed electionsPhragmen
jacogr Dec 9, 2019
5659026
s/HEADER/header/
jacogr Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^0.99.0-beta.11",
"@polkadot/api-contract": "^0.99.0-beta.11",
"@polkadot/api": "^0.99.0-beta.13",
"@polkadot/api-contract": "^0.99.0-beta.13",
"@polkadot/keyring": "^1.7.1",
"@polkadot/types": "^0.99.0-beta.11",
"@polkadot/types": "^0.99.0-beta.13",
"@polkadot/util": "^1.7.1",
"@polkadot/util-crypto": "^1.7.1",
"babel-core": "^7.0.0-bridge.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/Backup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ export default function ({ address, onClose }: Props): React.ReactElement<Props>
return (
<Modal
className='app--accounts-Modal'
header={t('Backup account')}
open
>
<Modal.Header>{t('Backup account')}</Modal.Header>
<Content
address={address}
doBackup={_doBackup}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/ChangePass.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class ChangePass extends TxComponent<Props, State> {
return (
<Modal
className='app--accounts-Modal'
header={t('Change account password')}
open
>
<Modal.Header>{t('Change account password')}</Modal.Header>
{this.renderContent()}
{this.renderButtons()}
</Modal>
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@ function Create ({ className, onClose, onStatusChange, seed: propsSeed, t, type:
return (
<Modal
className={className}
header={t('Add an account via seed')}
open
>
<Modal.Header>{t('Add an account via seed')}</Modal.Header>
{address && isConfirmationOpen && (
<CreateConfirmation
address={address}
Expand Down
8 changes: 4 additions & 4 deletions packages/app-accounts/src/modals/CreateConfirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ interface Props extends I18nProps {

function CreateConfirmation ({ address, name, onClose, onCommit, t }: Props): React.ReactElement<Props> | null {
return (
<Modal open>
<Modal.Header>
{t('Important notice')}
</Modal.Header>
<Modal
header={t('Important notice')}
open
>
<Modal.Content>
<AddressRow
defaultName={name}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/Derive.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ function Derive ({ className, from, onClose, t }: Props): React.ReactElement {
return (
<Modal
className={className}
header={t('Derive account from pair')}
open
>
<Modal.Header>{t('Derive account from pair')}</Modal.Header>
{address && isConfirmationOpen && (
<CreateConfirmation
address={address}
Expand Down
6 changes: 4 additions & 2 deletions packages/app-accounts/src/modals/Import.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ class Import extends TxComponent<Props, State> {
const { isFileValid, isPassValid } = this.state;

return (
<Modal open>
<Modal.Header>{t('Add via backup file')}</Modal.Header>
<Modal
header={t('Add via backup file')}
open
>
{this.renderInput()}
<Modal.Actions>
<Button.Group>
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/Qr.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ function QrModal ({ className, onClose, onStatusChange, t }: Props): React.React
return (
<Modal
className={className}
header={t('Add account via Qr')}
open
>
<Modal.Header>{t('Add account via Qr')}</Modal.Header>
<Modal.Content>
{
scanned
Expand Down
2 changes: 1 addition & 1 deletion packages/app-accounts/src/modals/Transfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ function Transfer ({ className, onClose, recipientId: propRecipientId, senderId:
return (
<Modal
className='app--accounts-Modal'
header={t('Send funds')}
open
>
<Modal.Header>{t('Send funds')}</Modal.Header>
<Modal.Content>
<div className={className}>
<InputAddress
Expand Down
6 changes: 4 additions & 2 deletions packages/app-address-book/src/modals/Create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ function Create ({ onClose, onStatusChange, t }: Props): React.ReactElement<Prop
};

return (
<Modal open>
<Modal.Header>{t('Add an address')}</Modal.Header>
<Modal
header={t('Add an address')}
open
>
<Modal.Content>
<AddressRow
defaultName={name}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.7.5",
"@polkadot/api-contract": "^0.99.0-beta.11",
"@polkadot/api-contract": "^0.99.0-beta.13",
"@polkadot/react-components": "^0.38.0-beta.54"
}
}
4 changes: 1 addition & 3 deletions packages/app-contracts/src/Contracts/Call.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,10 @@ function Call (props: Props): React.ReactElement<Props> | null {
return (
<Modal
className={[className || '', 'app--contracts-Modal'].join(' ')}
header={t('Call a contract')}
onClose={onClose}
open={isOpen}
>
<Modal.Header>
{t('Call a contract')}
</Modal.Header>
<Modal.Content>
{callContract && (
<div className='contracts--CallControls'>
Expand Down
4 changes: 1 addition & 3 deletions packages/app-contracts/src/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ class ContractModal<P extends ContractModalProps, S extends ContractModalState>
return (
<Modal
className='app--contracts-Modal'
header={t(this.headerText)}
onClose={this.onClose}
open={isOpen}
>
<Modal.Header>
{t(this.headerText)}
</Modal.Header>
<Modal.Content>
{this.renderContent()}
</Modal.Content>
Expand Down
4 changes: 1 addition & 3 deletions packages/app-contracts/src/RemoveABI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ function RemoveABI ({ code, onClose, onRemove, t }: Props): React.ReactElement<P
return (
<Modal
className='app--accounts-Modal'
header={t('Confirm ABI removal')}
onClose={onClose}
open
>
<Modal.Header>
{t('Confirm ABI removal')}
</Modal.Header>
<Modal.Content>
<CodeRow
code={code}
Expand Down
Loading