Skip to content
This repository has been archived by the owner on May 24, 2022. It is now read-only.

Change Cancel to Back button. Password field autofocus on Unlock component #370

Merged
merged 2 commits into from
Jan 18, 2019
Merged

Change Cancel to Back button. Password field autofocus on Unlock component #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebd14ee
fix: Rename Cancel to Back
ltfschoen Jan 18, 2019
e80dc54
feat: Add autofocus to password field on Unlock component
ltfschoen Jan 18, 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
2 changes: 1 addition & 1 deletion packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion ...ages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)}
Expand Down
4 changes: 2 additions & 2 deletions packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion ...ages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/BackupAccount/BackupAccount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/Send/ScanSignedTx/ScanSignedTx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/Send/TxQrCode/TxQrCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
>
Expand Down
5 changes: 3 additions & 2 deletions packages/fether-react/src/Send/Unlock/Unlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class Unlock extends Component {
</div>

<Field
autoFocus
label='Password'
name='password'
render={FetherForm.Field}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/fether-react/src/assets/sass/shared/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
}

&.-cancel {
&.-back {
font-size: ms(-2);
border-width: 0;
background-color: $faint;
Expand Down