Merge pull request #756 from gre/pixel-push-step-import

Pixel push step import

src/components/base/AccountsList/index.js

@@ -32,7 +32,7 @@ class AccountsList extends Component<
   },
 > {
   state = {
-    collapsed: false,
+    collapsed: !!this.props.collapsible,
   }
   toggleCollapse = () => {
     this.setState(({ collapsed }) => ({ collapsed: !collapsed }))

src/components/modals/AddAccounts/steps/03-step-import.js

@@ -213,7 +213,7 @@ class StepImport extends PureComponent<StepProps> {
     })
 
     const importedAccountsListTitle = t('app:addAccounts.accountAlreadyImportedSubtitle', {
-      count: importableAccounts.length,
+      count: importedAccounts.length,
     })
 
     const importableAccountsEmpty = t('app:addAccounts.noAccountToImport', { currencyName })
@@ -224,14 +224,6 @@ class StepImport extends PureComponent<StepProps> {
       <Fragment>
         <TrackPage category="AddAccounts" name="Step3" />
         <Box mt={-4}>
-          {importedAccounts.length === 0 ? null : (
-            <AccountsList
-              title={importedAccountsListTitle}
-              accounts={importedAccounts}
-              editedNames={editedNames}
-              collapsible
-            />
-          )}
           {importableAccounts.length === 0 ? null : (
             <AccountsList
               title={importableAccountsListTitle}
@@ -278,6 +270,14 @@ class StepImport extends PureComponent<StepProps> {
               hideAmount
             />
           )}
+          {importedAccounts.length === 0 ? null : (
+            <AccountsList
+              title={importedAccountsListTitle}
+              accounts={importedAccounts}
+              editedNames={editedNames}
+              collapsible
+            />
+          )}
           {scanStatus === 'scanning' ? (
             <LoadingRow>
               <Spinner color="grey" size={16} />

static/i18n/en/app.yml

@@ -150,9 +150,9 @@ addAccounts:
     connectDevice: Connect device
     import: Select accounts
     finish: Confirmation
-  accountAlreadyImportedSubtitle: Already in portfolio
+  accountAlreadyImportedSubtitle: '{{count}} Already in portfolio'
-  accountToImportSubtitle: 'Select account'
+  accountToImportSubtitle: 'Add existing account'
-  accountToImportSubtitle_plural: 'Select accounts'
+  accountToImportSubtitle_plural: 'Add existing accounts'
   selectAll: Select all ({{count}})
   unselectAll: Deselect all ({{count}})
   editName: Edit name
@@ -162,7 +162,7 @@ addAccounts:
   success: Account added to your portfolio
 # success_plural: Accounts successfully added to your portfolio.
   createNewAccount:
-    title: Create a new account
+    title: Add a new account
     noOperationOnLastAccount: 'You have to receive crypto assets on <1><0>{{accountName}}</0></1> before you can create a new account.'
     noAccountToCreate: No <1><0>{{currencyName}}</0></1> account was found to create
   somethingWentWrong: Something went wrong during synchronization, please try again.
@@ -257,7 +257,7 @@ send:
   totalSpent: Total
   steps:
     amount:
-      title: Send crypto assets
+      title: crypto assets
       selectAccountDebit: Select an account to debit
       recipientAddress: Recipient address # can't control the tooltip!
       amount: Amount