Merge pull request #370 from paritytech/luke-misc-thibaut

Change Cancel to Back button. Password field autofocus on Unlock component
openethereum · Jan 18, 2019 · 0e1e20d · 0e1e20d
2 parents 32b6f35 + e80dc54
commit 0e1e20d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js b/packages/fether-react/src/Accounts/CreateAccount/AccountCopyPhrase/AccountCopyPhrase.js
@@ -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'
                 >

diff --git a/...ages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js b/...ages/fether-react/src/Accounts/CreateAccount/AccountImportOptions/AccountImportOptions.js
@@ -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>
           )}

diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js b/packages/fether-react/src/Accounts/CreateAccount/AccountName/AccountName.js
@@ -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'
             >

diff --git a/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js b/packages/fether-react/src/Accounts/CreateAccount/AccountPassword/AccountPassword.js
@@ -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'
                 >

diff --git a/...ages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js b/...ages/fether-react/src/Accounts/CreateAccount/AccountRewritePhrase/AccountRewritePhrase.js
@@ -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'
             >

diff --git a/packages/fether-react/src/BackupAccount/BackupAccount.js b/packages/fether-react/src/BackupAccount/BackupAccount.js
@@ -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'
               >

diff --git a/packages/fether-react/src/Send/ScanSignedTx/ScanSignedTx.js b/packages/fether-react/src/Send/ScanSignedTx/ScanSignedTx.js
@@ -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'
                   >

diff --git a/packages/fether-react/src/Send/TxQrCode/TxQrCode.js b/packages/fether-react/src/Send/TxQrCode/TxQrCode.js
@@ -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'
                   >

diff --git a/packages/fether-react/src/Send/Unlock/Unlock.js b/packages/fether-react/src/Send/Unlock/Unlock.js
@@ -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

diff --git a/packages/fether-react/src/assets/sass/shared/_button.scss b/packages/fether-react/src/assets/sass/shared/_button.scss
@@ -101,7 +101,7 @@
     }
   }
 
-  &.-cancel {
+  &.-back {
     font-size: ms(-2);
     border-width: 0;
     background-color: $faint;