Mobile: Fix SeedVault export name (#1312)

iotaledger · Apr 15, 2019 · 3241e28 · 3241e28
1 parent 30aaebf
commit 3241e28
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/mobile/src/ui/components/SeedVaultExportComponent.js b/src/mobile/src/ui/components/SeedVaultExportComponent.js
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import values from 'lodash/values';
 import isEqual from 'lodash/isEqual';
 import React, { Component } from 'react';
@@ -168,8 +169,12 @@ class SeedVaultExportComponent extends Component {
             await getAndroidFileSystemPermissions();
         }
         const { t, selectedAccountName } = this.props;
-
-        const path = SeedVaultExportComponent.getPath(removeNonAlphaNumeric(selectedAccountName, 'SeedVault').trim());
+        const path = SeedVaultExportComponent.getPath(
+            removeNonAlphaNumeric(
+                isEmpty(global.onboardingSeed) ? selectedAccountName : '',
+                SEED_VAULT_DEFAULT_TITLE,
+            ).trim(),
+        );
 
         this.setState({ path });
 
@@ -261,7 +266,10 @@ class SeedVaultExportComponent extends Component {
                 // If it's undefined, use the fallback title
                 serialise({
                     seed: tritsToChars(this.state.seed),
-                    title: removeNonAlphaNumeric(selectedAccountName, SEED_VAULT_DEFAULT_TITLE),
+                    title: removeNonAlphaNumeric(
+                        isEmpty(global.onboardingSeed) ? selectedAccountName : '',
+                        SEED_VAULT_DEFAULT_TITLE,
+                    ),
                 }) +
                 '~' +
                 UInt8ToString(this.state.password),

diff --git a/src/mobile/src/ui/views/onboarding/NewSeedSetup.js b/src/mobile/src/ui/views/onboarding/NewSeedSetup.js
@@ -163,6 +163,7 @@ class NewSeedSetup extends Component {
     }
 
     onBackPress() {
+        delete global.onboardingSeed;
         navigator.pop(this.props.componentId);
     }
 

diff --git a/src/mobile/src/ui/views/onboarding/SetAccountName.js b/src/mobile/src/ui/views/onboarding/SetAccountName.js
@@ -136,6 +136,7 @@ export class SetAccountName extends Component {
         if (onboardingComplete) {
             const seedStore = await new SeedStore.keychain(global.passwordHash);
             seedStore.addAccount(accountName, global.onboardingSeed);
+            delete global.onboardingSeed;
             navigator.setStackRoot('loading');
         } else {
             navigator.push('setPassword');