Merge pull request #496 from James-Sangalli/0x-safe-key-imports

allows private key to have 0x or not

AlphaWallet/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.84</string>
+	<string>0.86</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

AlphaWallet/UI/Form/PrivateKeyRule.swift

@@ -15,7 +15,9 @@ public struct PrivateKeyRule<T: Equatable>: RuleType {
 
     public func isValid(value: T?) -> ValidationError? {
         if let str = value as? String {
-            return (str.count != 64) ? validationError : nil
+            //allows for private key import to have 0x or not
+            let drop0xKey = str.drop0x
+            return (drop0xKey.count != 64) ? validationError : nil
         }
         return value != nil ? nil : validationError
     }

AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift

@@ -249,7 +249,7 @@ class ImportWalletViewController: UIViewController {
         guard validate() else { return }
 
         let keystoreInput = keystoreJSONTextView.value.trimmed
-        let privateKeyInput = privateKeyTextView.value.trimmed
+        let privateKeyInput = privateKeyTextView.value.trimmed.drop0x
         let password = passwordTextField.value.trimmed
         let watchInput = watchAddressTextField.value.trimmed