Commit 67e14f80 authored by Luke Schoen's avatar Luke Schoen
Browse files

Merge branch 'master' into luke-337-screen-address-lengths

parents 37c60579 8e54eb70
Pipeline #28589 passed with stage
in 2 minutes and 51 seconds
......@@ -5,5 +5,5 @@
"packages/*"
],
"useWorkspaces": true,
"version": "0.2.0"
"version": "0.3.0"
}
\ No newline at end of file
{
"name": "fether",
"description": "Fether Wallet",
"version": "0.2.0",
"version": "0.3.0",
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
......
{
"name": "fether",
"description": "Fether Wallet",
"version": "0.2.0",
"version": "0.3.0",
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
......@@ -42,7 +42,7 @@
"@parity/electron": "^3.0.1",
"commander": "^2.15.1",
"commander-remaining-args": "^1.2.0",
"fether-react": "^0.2.0",
"fether-react": "^0.3.0",
"menubar": "^5.2.3",
"pino": "^4.16.1",
"pino-multi-stream": "^3.1.2",
......@@ -56,4 +56,4 @@
"electron-webpack": "^2.1.2",
"webpack": "^4.7.0"
}
}
}
\ No newline at end of file
{
"name": "fether-react",
"description": "Fether Wallet",
"version": "0.2.0",
"version": "0.3.0",
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
......@@ -48,7 +48,7 @@
"ethereumjs-tx": "^1.3.7",
"ethereumjs-util": "^6.0.0",
"ethereumjs-wallet": "^0.6.2",
"fether-ui": "^0.2.0",
"fether-ui": "^0.3.0",
"file-saver": "^2.0.0",
"final-form": "^4.8.3",
"final-form-calculate": "^1.2.1",
......
......@@ -57,7 +57,7 @@ class AccountCopyPhrase extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -213,7 +213,7 @@ class AccountImportOptions extends Component {
<p>{error}</p>
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button className='button -cancel' onClick={history.goBack}>
<button className='button -back' onClick={history.goBack}>
Back
</button>
)}
......
......@@ -97,7 +97,7 @@ class AccountName extends Component {
)}
</div>
<div className='account_change_blockies'>
<button className='button -cancel' onClick={generateNewAccount}>
<button className='button -back' onClick={generateNewAccount}>
Generate another icon
</button>
</div>
......@@ -132,7 +132,7 @@ class AccountName extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -107,7 +107,7 @@ class AccountPassword extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -72,7 +72,7 @@ class AccountRewritePhrase extends Component {
<nav className='form-nav -space-around'>
{currentStep > 1 && (
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -94,7 +94,7 @@ class BackupAccount extends Component {
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -83,7 +83,7 @@ class ScanSignedTx extends Component {
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -70,7 +70,7 @@ class TxQrCode extends Component {
/>
<nav className='form-nav -space-around'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
......
......@@ -95,6 +95,7 @@ class Unlock extends Component {
</div>
<Field
autoFocus
label='Password'
name='password'
render={FetherForm.Field}
......@@ -104,11 +105,11 @@ class Unlock extends Component {
<nav className='form-nav -binary'>
<button
className='button -cancel'
className='button -back'
onClick={history.goBack}
type='button'
>
Cancel
Back
</button>
<button
......
......@@ -101,7 +101,7 @@
}
}
&.-cancel {
&.-back {
font-size: ms(-2);
border-width: 0;
background-color: $faint;
......
{
"name": "fether-ui",
"description": "Fether Wallet",
"version": "0.2.0",
"version": "0.3.0",
"private": true,
"author": "Parity Team <admin@parity.io>",
"maintainers": [
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment