Disable mnemonic phrase.

nsnull0 · Jan 9, 2018 · af0aabe · af0aabe
1 parent 29a33d4
commit af0aabe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Podfile b/Podfile
@@ -55,3 +55,4 @@ post_install do |installer|
     end
   end
 end
+
diff --git a/Podfile.lock b/Podfile.lock
@@ -124,6 +124,6 @@ SPEC CHECKSUMS:
   TrustKeystore: 2c62775c98df86b7e2ef78c059581a4e8c98a054
   VENTouchLock: 20d378b9c6173e2c054448aeb3fb2f40822a9f3f
 
-PODFILE CHECKSUM: 763570d7b40ec2dbd7a197a827a33457f8805e23
+PODFILE CHECKSUM: f7a245b43f9da8021491b9d8b07045cb9bfa64df
 
 COCOAPODS: 1.3.1
diff --git a/Trust/EtherClient/EtherKeystore.swift b/Trust/EtherClient/EtherKeystore.swift
@@ -117,11 +117,10 @@ open class EtherKeystore: Keystore {
                     completion(.failure(error))
                 }
             }
-        case .mnemonic(let words):
-            guard let privateKey = Mnemonic.decode(words: words) else {
-                return completion(.failure(KeystoreError.failedToImportPrivateKey))
-            }
-            keystore(for: privateKey, password: newPassword) { result in
+        case .mnemonic(let words, let password):
+            let key = ""
+            // TODO: Implement it
+            keystore(for: key, password: newPassword) { result in
                 switch result {
                 case .success(let value):
                     self.importKeystore(

diff --git a/Trust/EtherClient/ImportType.swift b/Trust/EtherClient/ImportType.swift
@@ -6,6 +6,6 @@ import TrustKeystore
 enum ImportType {
     case keystore(string: String, password: String)
     case privateKey(privateKey: String)
-    case mnemonic(words: [String])
+    case mnemonic(words: [String], password: String)
     case watch(address: Address)
 }
diff --git a/Trust/Wallet/ViewControllers/ImportWalletViewController.swift b/Trust/Wallet/ViewControllers/ImportWalletViewController.swift
@@ -100,7 +100,7 @@ class ImportWalletViewController: FormViewController {
 
             <<< SegmentedRow<String>(Values.segment) {
                 $0.options = [
-                    ImportSelectionType.mnemonic.title,
+                    //ImportSelectionType.mnemonic.title,
                     ImportSelectionType.keystore.title,
                     ImportSelectionType.privateKey.title,
                     ImportSelectionType.watch.title,
@@ -193,7 +193,7 @@ class ImportWalletViewController: FormViewController {
             case .privateKey:
                 return .privateKey(privateKey: privateKeyInput)
             case .mnemonic:
-                return .mnemonic(words: words)
+                return .mnemonic(words: words, password: password)
             case .watch:
                 return .watch(address: Address(string: watchInput))
             }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,3 +55,4 @@ post_install do \|installer\|
		end
		end
		end