Merge branch 'new-world' into CAKE-49-refactor-send-and-exchange-screen

# Conflicts: # lib/di.dart # lib/src/screens/base_page.dart # lib/src/screens/exchange/widgets/base_exchange_widget.dart # lib/src/screens/send/widgets/base_send_widget.dart # pubspec.lock
2025-03-26 00:58:44 +00:00 · 2020-09-22 21:59:13 +03:00 · 2020-09-22 21:59:13 +03:00 · a0164ec33f
commit a0164ec33f
parent 585f90b2fb c53b6676b2
338 changed files with 3759 additions and 9080 deletions
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@ -1,5 +1,3 @@
-include: package:pedantic/analysis_options.yaml
-
 analyzer:
  strong-mode:
    implicit-casts: false
--- a/android/app/src/main/kotlin/com/cakewallet/cake_wallet/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/cakewallet/cake_wallet/MainActivity.kt
@ -0,0 +1,6 @@
+package com.cakewallet.cake_wallet
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
--- a/assets/images/monero_logo.png
+++ b/assets/images/monero_logo.png
--- a/cw_monero/ios/Classes/monero_api.cpp
+++ b/cw_monero/ios/Classes/monero_api.cpp
@ -180,7 +180,7 @@ extern "C"
    void change_current_wallet(Monero::Wallet *wallet)
    {
        m_wallet = wallet;
-        // m_listener = nullptr;
+        m_listener = nullptr;
        

        if (wallet != nullptr)
@ -553,7 +553,7 @@ extern "C"

        if (m_listener != nullptr)
        {
-            free(m_listener);
+            // free(m_listener);
        }

        m_listener = new MoneroWalletListener();
--- a/cw_monero/lib/wallet.dart
+++ b/cw_monero/lib/wallet.dart
@ -254,12 +254,12 @@ class SyncListner {
        onNewBlock(syncHeight, left, ptc);
      }

-      if (newTransactionExist && onNewTransaction != null) {
-        onNewTransaction();
+      if (newTransactionExist) {
+        onNewTransaction?.call();
      }

-      if (needToRefresh && onNeedToRefresh != null) {
-        onNeedToRefresh();
+      if (needToRefresh) {
+        onNeedToRefresh?.call();
      }
    });
  }
--- a/ios/CakeWallet/EncryptedFile.swift
+++ b/ios/CakeWallet/EncryptedFile.swift
@ -0,0 +1,50 @@
+import Foundation
+import CryptoSwift
+
+class EncryptedFile {
+    
+    private(set) var fileName: String
+    private(set) var url: URL
+    private let key: Array<UInt8>
+    private let salt: Array<UInt8>
+    
+    init(url: URL, key: String, salt: String) {
+        self.key = key.data(using: .utf8)?.bytes ?? []
+        self.salt = salt.data(using: .utf8)?.bytes ?? []
+        self.url = url
+        self.fileName = url.lastPathComponent
+    }
+    
+    func readRawContent() -> String? {
+        guard let binaryContent = try? Data(contentsOf: url) else {
+            return nil
+        }
+        
+        return String(data: binaryContent, encoding: .utf8)
+    }
+    
+    func decryptedContent() -> String? {
+        guard
+            let rawContent = readRawContent(),
+            let decryptedBytes = try? cipherBuilder().decrypt(rawContent.bytes) else {
+            return nil
+        }
+        
+        let decryptedData = Data(decryptedBytes)
+        return String(data: decryptedData, encoding: .utf8)
+    }
+    
+    func cipherBuilder() -> Cipher {
+        let PBKDF2key = try! PKCS5.PBKDF2(password: key, salt:  salt, iterations: 4096, variant: .sha256).calculate()
+        return try! Blowfish(key: PBKDF2key, padding: .pkcs7)
+    }
+}
+
+func readTradesList(key: String, salt: String) -> String? {
+    let url = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("trades_list.json")
+
+    return EncryptedFile(
+        url: url,
+        key: key,
+        salt: salt).decryptedContent()
+}
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@ -1 +0,0 @@
-a2dce69f54a78f5b00e19850e4b2d402
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '9.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@ -10,78 +10,35 @@ project 'Runner', {
  'Release' => :release,
 }

-def parse_KV_file(file, separator='=')
-  file_abs_path = File.expand_path(file)
-  if !File.exists? file_abs_path
-    return [];
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
  end
-  generated_key_values = {}
-  skip_line_start_symbols = ["#", "/"]
-  File.foreach(file_abs_path) do |line|
-    next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
-    plugin = line.split(pattern=separator)
-    if plugin.length == 2
-      podname = plugin[0].strip()
-      path = plugin[1].strip()
-      podpath = File.expand_path("#{path}", file_abs_path)
-      generated_key_values[podname] = podpath
-    else
-      puts "Invalid plugin specification: #{line}"
-    end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
  end
-  generated_key_values
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
 end

+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
 target 'Runner' do
  use_frameworks!
  use_modular_headers!

-  # Flutter Pod
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))

-  copied_flutter_dir = File.join(__dir__, 'Flutter')
-  copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
-  copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
-  unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
-    # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
-    # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
-    # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.
-
-    generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
-    unless File.exist?(generated_xcode_build_settings_path)
-      raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-    end
-    generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
-    cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
-
-    unless File.exist?(copied_framework_path)
-      FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
-    end
-    unless File.exist?(copied_podspec_path)
-      FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
-    end
-  end
-
-  # Keep pod path relative so it can be checked into Podfile.lock.
-  pod 'Flutter', :path => 'Flutter'
-
-  # Plugin Pods
-
-  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
-  # referring to absolute paths on developers' machines.
-  system('rm -rf .symlinks')
-  system('mkdir -p .symlinks/plugins')
-  plugin_pods = parse_KV_file('../.flutter-plugins')
-  plugin_pods.each do |name, path|
-    symlink = File.join('.symlinks', 'plugins', name)
-    File.symlink(path, symlink)
-    pod name, :path => File.join(symlink, 'ios')
-  end
+  # Cake Wallet (Legacy)
+  pod 'CryptoSwift'
 end

 post_install do |installer|
  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['ENABLE_BITCODE'] = 'NO'
-    end
+    flutter_additional_ios_build_settings(target)
  end
 end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -3,6 +3,10 @@ PODS:
    - Flutter
    - MTBBarcodeScanner
    - SwiftProtobuf
+  - connectivity (0.0.1):
+    - Flutter
+    - Reachability
+  - CryptoSwift (1.3.2)
  - cw_monero (0.0.2):
    - cw_monero/Boost (= 0.0.2)
    - cw_monero/lmdb (= 0.0.2)
@ -25,8 +29,6 @@ PODS:
  - esys_flutter_share (0.0.1):
    - Flutter
  - Flutter (1.0.0)
-  - flutter_plugin_android_lifecycle (0.0.1):
-    - Flutter
  - flutter_secure_storage (3.3.1):
    - Flutter
  - local_auth (0.0.1):
@ -36,61 +38,43 @@ PODS:
    - Flutter
  - path_provider (0.0.1):
    - Flutter
-  - path_provider_linux (0.0.1):
-    - Flutter
-  - path_provider_macos (0.0.1):
-    - Flutter
+  - Reachability (3.2)
  - share (0.0.1):
    - Flutter
  - shared_preferences (0.0.1):
    - Flutter
-  - shared_preferences_linux (0.0.1):
-    - Flutter
-  - shared_preferences_macos (0.0.1):
-    - Flutter
-  - shared_preferences_web (0.0.1):
-    - Flutter
-  - SwiftProtobuf (1.8.0)
+  - SwiftProtobuf (1.12.0)
  - url_launcher (0.0.1):
    - Flutter
-  - url_launcher_linux (0.0.1):
-    - Flutter
-  - url_launcher_macos (0.0.1):
-    - Flutter
-  - url_launcher_web (0.0.1):
-    - Flutter

 DEPENDENCIES:
  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
+  - connectivity (from `.symlinks/plugins/connectivity/ios`)
+  - CryptoSwift
  - cw_monero (from `.symlinks/plugins/cw_monero/ios`)
  - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
  - esys_flutter_share (from `.symlinks/plugins/esys_flutter_share/ios`)
  - Flutter (from `Flutter`)
-  - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
  - local_auth (from `.symlinks/plugins/local_auth/ios`)
  - package_info (from `.symlinks/plugins/package_info/ios`)
  - path_provider (from `.symlinks/plugins/path_provider/ios`)
-  - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
-  - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
  - share (from `.symlinks/plugins/share/ios`)
  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
-  - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
-  - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
-  - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
-  - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
-  - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
-  - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)

 SPEC REPOS:
  trunk:
+    - CryptoSwift
    - MTBBarcodeScanner
+    - Reachability
    - SwiftProtobuf

 EXTERNAL SOURCES:
  barcode_scan:
    :path: ".symlinks/plugins/barcode_scan/ios"
+  connectivity:
+    :path: ".symlinks/plugins/connectivity/ios"
  cw_monero:
    :path: ".symlinks/plugins/cw_monero/ios"
  devicelocale:
@ -99,8 +83,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/esys_flutter_share/ios"
  Flutter:
    :path: Flutter
-  flutter_plugin_android_lifecycle:
-    :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
  flutter_secure_storage:
    :path: ".symlinks/plugins/flutter_secure_storage/ios"
  local_auth:
@ -109,54 +91,32 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/package_info/ios"
  path_provider:
    :path: ".symlinks/plugins/path_provider/ios"
-  path_provider_linux:
-    :path: ".symlinks/plugins/path_provider_linux/ios"
-  path_provider_macos:
-    :path: ".symlinks/plugins/path_provider_macos/ios"
  share:
    :path: ".symlinks/plugins/share/ios"
  shared_preferences:
    :path: ".symlinks/plugins/shared_preferences/ios"
-  shared_preferences_linux:
-    :path: ".symlinks/plugins/shared_preferences_linux/ios"
-  shared_preferences_macos:
-    :path: ".symlinks/plugins/shared_preferences_macos/ios"
-  shared_preferences_web:
-    :path: ".symlinks/plugins/shared_preferences_web/ios"
  url_launcher:
    :path: ".symlinks/plugins/url_launcher/ios"
-  url_launcher_linux:
-    :path: ".symlinks/plugins/url_launcher_linux/ios"
-  url_launcher_macos:
-    :path: ".symlinks/plugins/url_launcher_macos/ios"
-  url_launcher_web:
-    :path: ".symlinks/plugins/url_launcher_web/ios"

 SPEC CHECKSUMS:
  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
+  connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
+  CryptoSwift: 093499be1a94b0cae36e6c26b70870668cb56060
  cw_monero: 2e1f79929880cc2293b5bc1b25e28152e4d84649
  devicelocale: feebbe5e7a30adb8c4f83185de1b50ff19b44f00
  esys_flutter_share: 403498dab005b36ce1f8d7aff377e81f0621b0b4
  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
  flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
  local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
-  path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
+  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
  share: 0b2c3e82132f5888bccca3351c504d0003b3b410
  shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
-  shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
-  shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
-  SwiftProtobuf: 2cbd9409689b7df170d82a92a33443c8e3e14a70
+  SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
-  url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
-  url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
-  url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c

-PODFILE CHECKSUM: c34e2287a9ccaa606aeceab922830efb9a6ff69a
+PODFILE CHECKSUM: ade2ba43f8c2af4060c025bfd25a553d068ab914

 COCOAPODS: 1.9.3
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -3,17 +3,15 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {

 /* Begin PBXBuildFile section */
-		02AA3DBD66A19A0A1732294D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B973AD352B2957AC387EA9 /* Pods_Runner.framework */; };
-		0C0DB1F8237DB1AE00BD32F9 /* A.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0DB1F7237DB1AE00BD32F9 /* A.swift */; };
+		0C44A71A2518EF8000B570ED /* EncryptedFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44A7192518EF8000B570ED /* EncryptedFile.swift */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
-		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
-		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
+		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@ -33,26 +31,24 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		00B973AD352B2957AC387EA9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		0C0DB1F6237DB1AD00BD32F9 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
-		0C0DB1F7237DB1AE00BD32F9 /* A.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = A.swift; sourceTree = "<group>"; };
+		0C44A7192518EF8000B570ED /* EncryptedFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptedFile.swift; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		4B157CEA62824A43D7DD4C38 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
+		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A64AD09573DE1F9B50A18F2A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		B39AAE9F098686B29374F51D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -60,13 +56,39 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				02AA3DBD66A19A0A1732294D /* Pods_Runner.framework in Frameworks */,
+				20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
+		06957875428D0F5AAE053765 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		0C44A7182518EF4A00B570ED /* CakeWallet */ = {
+			isa = PBXGroup;
+			children = (
+				0C44A7192518EF8000B570ED /* EncryptedFile.swift */,
+			);
+			path = CakeWallet;
+			sourceTree = "<group>";
+		};
+		84389F1A05D5860790D82820 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */,
+				501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */,
+				61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@ -81,11 +103,12 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
+				0C44A7182518EF4A00B570ED /* CakeWallet */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				BB72635863665F0C75A8EBE5 /* Pods */,
-				D7C5668014A527FFA32576AF /* Frameworks */,
+				84389F1A05D5860790D82820 /* Pods */,
+				06957875428D0F5AAE053765 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@ -100,47 +123,18 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
-				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
-				97C146F11CF9000F007C117D /* Supporting Files */,
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-				0C0DB1F7237DB1AE00BD32F9 /* A.swift */,
-				0C0DB1F6237DB1AD00BD32F9 /* Runner-Bridging-Header.h */,
+				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		97C146F11CF9000F007C117D /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				97C146F21CF9000F007C117D /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		BB72635863665F0C75A8EBE5 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				4B157CEA62824A43D7DD4C38 /* Pods-Runner.debug.xcconfig */,
-				A64AD09573DE1F9B50A18F2A /* Pods-Runner.release.xcconfig */,
-				B39AAE9F098686B29374F51D /* Pods-Runner.profile.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		D7C5668014A527FFA32576AF /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				00B973AD352B2957AC387EA9 /* Pods_Runner.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@ -148,14 +142,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				95C66705E4338EEA09DF7047 /* [CP] Check Pods Manifest.lock */,
+				0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				A51ED02C4D7DF0F1E59D04DE /* [CP] Embed Pods Frameworks */,
+				DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@ -173,17 +167,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = "The Chromium Authors";
+				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 32J6BB6VUS;
-						LastSwiftMigration = 1120;
+						LastSwiftMigration = 1100;
 					};
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@ -207,7 +200,6 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@ -216,21 +208,7 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-		};
-		95C66705E4338EEA09DF7047 /* [CP] Check Pods Manifest.lock */ = {
+		0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -252,6 +230,20 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -266,46 +258,17 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		A51ED02C4D7DF0F1E59D04DE /* [CP] Embed Pods Frameworks */ = {
+		DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
-				"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
-				"${BUILT_PRODUCTS_DIR}/barcode_scan/barcode_scan.framework",
-				"${BUILT_PRODUCTS_DIR}/cw_monero/cw_monero.framework",
-				"${BUILT_PRODUCTS_DIR}/devicelocale/devicelocale.framework",
-				"${BUILT_PRODUCTS_DIR}/esys_flutter_share/esys_flutter_share.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_plugin_android_lifecycle/flutter_plugin_android_lifecycle.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
-				"${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
-				"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
-				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
-				"${BUILT_PRODUCTS_DIR}/share/share.framework",
-				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
-				"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cw_monero.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/devicelocale.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/esys_flutter_share.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_plugin_android_lifecycle.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@ -319,10 +282,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
-				97C146F31CF9000F007C117D /* main.m in Sources */,
+				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-				0C0DB1F8237DB1AE00BD32F9 /* A.swift in Sources */,
+				0C44A71A2518EF8000B570ED /* EncryptedFile.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -389,9 +351,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@ -411,8 +374,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@ -422,7 +387,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 arm64e";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@ -474,7 +439,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@ -523,9 +488,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@ -545,8 +513,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@ -557,7 +527,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 arm64e";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@ -576,8 +546,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@ -587,7 +559,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "arm64 arm64e";
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
--- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
--- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@ -27,6 +27,8 @@
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
      <MacroExpansion>
         <BuildableReference
            BuildableIdentifier = "primary"
@ -36,8 +38,8 @@
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <Testables>
-      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </TestAction>
   <LaunchAction
      buildConfiguration = "Debug"
@ -59,6 +61,8 @@
            ReferencedContainer = "container:Runner.xcodeproj">
         </BuildableReference>
      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
      buildConfiguration = "Profile"
--- a/ios/Runner/A.swift
+++ b/ios/Runner/A.swift
@ -1 +0,0 @@
-import Foundation
--- a/ios/Runner/AppDelegate.h
+++ b/ios/Runner/AppDelegate.h
@ -1,6 +0,0 @@
-#import <Flutter/Flutter.h>
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : FlutterAppDelegate
-
-@end
--- a/ios/Runner/AppDelegate.m
+++ b/ios/Runner/AppDelegate.m
@ -1,25 +0,0 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
-
-@implementation AppDelegate
-
- (BOOL)application:(UIApplication *)application
-    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  [GeneratedPluginRegistrant registerWithRegistry:self];
-  // Override point for customization after application launch.
-  return [super application:application didFinishLaunchingWithOptions:launchOptions];
-}
-
- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    UIViewController *blankViewController = [UIViewController new];
-    blankViewController.view.backgroundColor = [UIColor blackColor];
-    [self.window.rootViewController presentViewController:blankViewController animated:NO completion:NULL];
-}
-
- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    [self.window.rootViewController dismissViewControllerAnimated:NO completion:NO];
-}
-
-@end
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@ -1,40 +1,43 @@
 import UIKit
 import Flutter
-import CWMonero
-
-class MoneroWalletManagerHandler {
-//    static let moneroWalletManager = MoneroWalletGateway()
-}

@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    let controller : FlutterViewController = window?.rootViewController as! FlutterViewController
-    let moneroWalletManagerChannel = FlutterMethodChannel(name: "com.cakewallet.wallet/monero-wallet-manager",
-                                              binaryMessenger: controller.binaryMessenger)
-    moneroWalletManagerChannel.setMethodCallHandler({
-      (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
-      
-    })
-    
-    moneroWalletManagerChannel.setMethodCallHandler({
-      [weak self] (call: FlutterMethodCall, result: FlutterResult) -> Void in
-        switch call.method {
-        case "createWallet":
-            result(1)
-        case "isWalletExist":
-            result(false)
-        default:
-            result(FlutterMethodNotImplemented)
-        }
+    override func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
+        let controller : FlutterViewController = window?.rootViewController as! FlutterViewController
+        let batteryChannel = FlutterMethodChannel(name: "com.cakewallet.cakewallet/legacy_wallet_migration",
+                                                  binaryMessenger: controller.binaryMessenger)
+        batteryChannel.setMethodCallHandler({
+            (call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
+            
+            switch call.method {
+            case "read_trade_list":
+                guard let args = call.arguments as? Dictionary<String, Any>,
+                      let key = args["key"] as? String,
+                      let salt = args["salt"] as? String else {
+                    return
+                }
+                let normalizedKey = key.replacingOccurrences(of: "-", with: "")
+                result(readTradesList(key: normalizedKey, salt: salt))
+            case "read_encrypted_file":
+                guard let args = call.arguments as? Dictionary<String, Any>,
+                      let path = args["path"] as? String,
+                      let key = args["key"] as? String,
+                      let salt = args["salt"] as? String else {
+                    return
+                }
+                
+                let content = EncryptedFile(url: URL(fileURLWithPath: path), key: key, salt: salt).decryptedContent()
+                result(content)
+            default:
+                break
+            }
+        })
        
-        result(1);
-    })
-    
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
+        GeneratedPluginRegistrant.register(with: self)
+        return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    }
 }
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Enable Face ID for fast and secure access to wallets and private keys</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@ -24,8 +22,6 @@
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>Used for scan QR code</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@ -33,8 +29,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
--- a/ios/Runner/Runner-Bridging-Header.h
+++ b/ios/Runner/Runner-Bridging-Header.h
@ -1 +1 @@
-#import "GeneratedPluginRegistrant.h"
+#import "GeneratedPluginRegistrant.h"
--- a/ios/Runner/main.m
+++ b/ios/Runner/main.m
@ -1,9 +0,0 @@
-#import <Flutter/Flutter.h>
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char* argv[]) {
-  @autoreleasepool {
-    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-  }
-}
--- a/lib/bitcoin/api.dart
+++ b/lib/bitcoin/api.dart
@ -1,21 +0,0 @@
-import 'dart:convert';
-import 'package:http/http.dart';
-
-const blockchainInfoBaseURI = 'https://blockchain.info';
-const multiAddressURI = '$blockchainInfoBaseURI/multiaddr';
-
-Future<List<String>> fetchAllAddresses({String xpub}) async {
-  final uri = '$multiAddressURI?active=$xpub';
-  final response = await get(uri);
-  final responseJSON = json.decode(response.body) as Map<String, dynamic>;
-
-  print(responseJSON);
-
-  return (responseJSON['addresses'] as List<dynamic>).map((dynamic row) {
-    if (row is Map<String, Object>) {
-      return row['address'] as String;
-    }
-
-    return '';
-  }).toList();
-}
--- a/lib/bitcoin/bitcoin_amount_format.dart
+++ b/lib/bitcoin/bitcoin_amount_format.dart
@ -1,5 +1,5 @@
 import 'package:intl/intl.dart';
-import 'package:cake_wallet/src/domain/common/crypto_amount_format.dart';
+import 'package:cake_wallet/entities/crypto_amount_format.dart';

 const bitcoinAmountLength = 8;
 const bitcoinAmountDivider = 100000000;
@ -11,3 +11,6 @@ String bitcoinAmountToString({int amount}) =>
    bitcoinAmountFormat.format(cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider));

 double bitcoinAmountToDouble({int amount}) => cryptoAmountToDouble(amount: amount, divider: bitcoinAmountDivider);
+
+int doubleToBitcoinAmount(double amount) =>
+    (amount * bitcoinAmountDivider).toInt();
--- a/lib/bitcoin/bitcoin_balance.dart
+++ b/lib/bitcoin/bitcoin_balance.dart
@ -2,7 +2,7 @@ import 'dart:convert';

 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/balance.dart';
+import 'package:cake_wallet/entities/balance.dart';

 class BitcoinBalance extends Balance {
  const BitcoinBalance({@required this.confirmed, @required this.unconfirmed}) : super();
--- a/lib/bitcoin/bitcoin_transaction_credentials.dart
+++ b/lib/bitcoin/bitcoin_transaction_credentials.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';

 class BitcoinTransactionCredentials {
  BitcoinTransactionCredentials(this.address, this.amount, this.priority);
--- a/lib/bitcoin/bitcoin_transaction_history.dart
+++ b/lib/bitcoin/bitcoin_transaction_history.dart
@ -9,8 +9,6 @@ import 'package:cake_wallet/bitcoin/electrum.dart';

 part 'bitcoin_transaction_history.g.dart';

-// TODO: Think about another transaction store for bitcoin transaction history..
-
 const _transactionsHistoryFileName = 'transactions.json';

 class BitcoinTransactionHistory = BitcoinTransactionHistoryBase
@ -60,16 +58,7 @@ abstract class BitcoinTransactionHistoryBase
    final histories =
        wallet.scriptHashes.map((scriptHash) => eclient.getHistory(scriptHash));
    final _historiesWithDetails = await Future.wait(histories)
-        .then((histories) => histories
-//            .map((h) => h.where((tx) {
-//                  final height = tx['height'] as int ?? 0;
-//                  // FIXME: Filter only needed transactions
-//                  final _tx = get(tx['tx_hash'] as String);
-//
-//                  return height == 0 || height > _height;
-//                }))
-            .expand((i) => i)
-            .toList())
+        .then((histories) => histories.expand((i) => i).toList())
        .then((histories) => histories.map((tx) => fetchTransactionInfo(
            hash: tx['tx_hash'] as String, height: tx['height'] as int)));
    final historiesWithDetails = await Future.wait(_historiesWithDetails);
--- a/lib/bitcoin/bitcoin_transaction_info.dart
+++ b/lib/bitcoin/bitcoin_transaction_info.dart
@ -1,22 +1,22 @@
 import 'package:flutter/foundation.dart';
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:bitcoin_flutter/src/payments/index.dart' show PaymentData;
+import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/format_amount.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';
+import 'package:cake_wallet/entities/format_amount.dart';

 class BitcoinTransactionInfo extends TransactionInfo {
  BitcoinTransactionInfo(
-      {@required this.id,
+      {@required String id,
      @required int height,
      @required int amount,
      @required TransactionDirection direction,
      @required bool isPending,
      @required DateTime date,
      @required int confirmations}) {
+    this.id = id;
    this.height = height;
    this.amount = amount;
    this.direction = direction;
@ -97,7 +97,6 @@ class BitcoinTransactionInfo extends TransactionInfo {
        ? DateTime.fromMillisecondsSinceEpoch(timestamp * 1000)
        : DateTime.now();

-    // FIXME: Get transaction is pending
    return BitcoinTransactionInfo(
        id: tx.getId(),
        height: height,
@ -119,8 +118,6 @@ class BitcoinTransactionInfo extends TransactionInfo {
        confirmations: data['confirmations'] as int);
  }

-  final String id;
-
  String _fiatAmount;

  @override
--- a/lib/bitcoin/bitcoin_wallet.dart
+++ b/lib/bitcoin/bitcoin_wallet.dart
@ -1,39 +1,29 @@
 import 'dart:async';
-import 'dart:typed_data';
 import 'dart:convert';
+import 'package:mobx/mobx.dart';
+import 'package:bip39/bip39.dart' as bip39;
+import 'package:flutter/foundation.dart';
+import 'package:rxdart/rxdart.dart';
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_credentials.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_no_inputs_exception.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_wrong_balance_exception.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_unspent.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_keys.dart';
+import 'package:cake_wallet/bitcoin/electrum.dart';
 import 'package:cake_wallet/bitcoin/pending_bitcoin_transaction.dart';
 import 'package:cake_wallet/bitcoin/script_hash.dart';
 import 'package:cake_wallet/bitcoin/utils.dart';
-import 'package:cake_wallet/src/domain/bitcoin/bitcoin_amount_format.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cw_monero/transaction_history.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:mobx/mobx.dart';
-import 'package:bip39/bip39.dart' as bip39;
-import 'package:flutter/foundation.dart';
-import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:bitcoin_flutter/src/payments/index.dart' show PaymentData;
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_history.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_address_record.dart';
 import 'package:cake_wallet/bitcoin/file.dart';
-import 'package:cake_wallet/bitcoin/electrum.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_balance.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
+import 'package:cake_wallet/entities/node.dart';
 import 'package:cake_wallet/core/wallet_base.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:hex/hex.dart';
-import 'package:cake_wallet/di.dart';
-import 'package:shared_preferences/shared_preferences.dart';

 part 'bitcoin_wallet.g.dart';

@ -44,8 +34,8 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
      {@required this.eclient,
      @required this.path,
      @required String password,
-      @required this.name,
-      List<BitcoinAddressRecord> initialAddresses,
+      @required WalletInfo walletInfo,
+      @required List<BitcoinAddressRecord> initialAddresses,
      int accountIndex = 0,
      this.transactionHistory,
      this.mnemonic,
@ -60,9 +50,7 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
        syncStatus = NotConnectedSyncStatus(),
        _password = password,
        _accountIndex = accountIndex,
-        _addressesKeys = {} {
-    type = WalletType.bitcoin;
-    currency = CryptoCurrency.btc;
+        super(walletInfo) {
    _scripthashesUpdateSubject = {};
  }

@ -114,7 +102,6 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
    return BitcoinWallet._internal(
        eclient: eclient,
        path: walletPath,
-        name: name,
        mnemonic: mnemonic,
        password: password,
        accountIndex: accountIndex,
@ -130,9 +117,6 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
  final ElectrumClient eclient;
  final String mnemonic;

-  @override
-  String name;
-
  @override
  @observable
  String address;
@ -147,8 +131,6 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {

  ObservableList<BitcoinAddressRecord> addresses;

-  Map<String, bitcoin.ECPair> _addressesKeys;
-
  List<String> get scriptHashes =>
      addresses.map((addr) => scriptHash(addr.address)).toList();

@ -161,8 +143,8 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
  BitcoinWalletKeys get keys => BitcoinWalletKeys(
      wif: hd.wif, privateKey: hd.privKey, publicKey: hd.pubKey);

+  final String _password;
  int _accountIndex;
-  String _password;
  Map<String, BehaviorSubject<Object>> _scripthashesUpdateSubject;

  Future<void> init() async {
@ -334,6 +316,11 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
  bitcoin.ECPair keyPairFor({@required int index}) =>
      generateKeyPair(hd: hd, index: index);

+  @override
+  Future<void> rescan({int height}) async {
+    // FIXME: Unimplemented
+  }
+
  void _subscribeForUpdates() {
    scriptHashes.forEach((sh) async {
      await _scripthashesUpdateSubject[sh]?.close();
--- a/lib/bitcoin/bitcoin_wallet_service.dart
+++ b/lib/bitcoin/bitcoin_wallet_service.dart
@ -4,8 +4,8 @@ import 'package:cake_wallet/bitcoin/file.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet_creation_credentials.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_wallet.dart';
-import 'package:cake_wallet/src/domain/common/pathForWallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/pathForWallet.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 class BitcoinWalletService extends WalletService<
    BitcoinNewWalletCredentials,
--- a/lib/bitcoin/electrum.dart
+++ b/lib/bitcoin/electrum.dart
@ -40,6 +40,7 @@ class ElectrumClient {
        _tasks = {};

  static const connectionTimeout = Duration(seconds: 5);
+  static const aliveTimerDuration = Duration(seconds: 2);

  bool get isConnected => _isConnected;
  Socket socket;
@ -97,8 +98,7 @@ class ElectrumClient {

  void keepAlive() {
    _aliveTimer?.cancel();
-    // FIXME: Unnamed constant.
-    _aliveTimer = Timer.periodic(Duration(seconds: 2), (_) async => ping());
+    _aliveTimer = Timer.periodic(aliveTimerDuration, (_) async => ping());
  }

  Future<void> ping() async {
--- a/lib/bitcoin/file.dart
+++ b/lib/bitcoin/file.dart
@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:convert';
 import 'package:cake_wallet/bitcoin/key.dart';
 import 'package:encrypt/encrypt.dart' as encrypt;
 import 'package:flutter/foundation.dart';
@ -28,14 +27,13 @@ Future<void> writeData(
  f.writeAsStringSync(encrypted);
 }

-Future<String> read(
-    {@required String path, @required String password}) async {
+Future<String> read({@required String path, @required String password}) async {
  final file = File(path);

  if (!file.existsSync()) {
    file.createSync();
  }
-  
+
  final encrypted = file.readAsStringSync();

  return decode(password: password, data: encrypted);
--- a/lib/bitcoin/pending_bitcoin_transaction.dart
+++ b/lib/bitcoin/pending_bitcoin_transaction.dart
@ -1,6 +1,6 @@
 import 'package:cake_wallet/bitcoin/bitcoin_amount_format.dart';
 import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
-import 'package:cake_wallet/src/domain/common/transaction_direction.dart';
+import 'package:cake_wallet/entities/transaction_direction.dart';
 import 'package:flutter/foundation.dart';
 import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:cake_wallet/core/pending_transaction.dart';
--- a/lib/core/address_label_validator.dart
+++ b/lib/core/address_label_validator.dart
@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 class AddressLabelValidator extends TextValidator {
  AddressLabelValidator({WalletType type})
--- a/lib/core/address_validator.dart
+++ b/lib/core/address_validator.dart
@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';

 class AddressValidator extends TextValidator {
  AddressValidator({@required CryptoCurrency type})
--- a/lib/core/amount.dart
+++ b/lib/core/amount.dart
@ -0,0 +1,37 @@
+abstract class Amount {
+  Amount(this.value);
+
+  int value;
+
+  int minorDigits;
+
+  String code;
+
+  String formatted();
+}
+
+class MoneroAmount extends Amount {
+  MoneroAmount(int value) : super(value) {
+    minorDigits = 12;
+    code = 'XMR';
+  }
+
+  // const moneroAmountLength = 12;
+  // const moneroAmountDivider = 1000000000000;
+  // final moneroAmountFormat = NumberFormat()
+  //   ..maximumFractionDigits = moneroAmountLength
+  //   ..minimumFractionDigits = 1;
+
+  // String moneroAmountToString({int amount}) =>
+  //     moneroAmountFormat.format(cryptoAmountToDouble(amount: amount, divider: moneroAmountDivider));
+
+  // double moneroAmountToDouble({int amount}) => cryptoAmountToDouble(amount: amount, divider: moneroAmountDivider);
+
+  // int moneroParseAmount({String amount}) => moneroAmountFormat.parse(amount).toInt();
+
+  @override
+  String formatted() {
+    // TODO: implement formatted
+    throw UnimplementedError();
+  }
+}
--- a/lib/core/amount_converter.dart
+++ b/lib/core/amount_converter.dart
@ -0,0 +1,92 @@
+import 'package:intl/intl.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+
+class AmountConverter {
+  static const _moneroAmountLength = 12;
+  static const _moneroAmountDivider = 1000000000000;
+  static const _litecoinAmountDivider = 100000000;
+  static const _ethereumAmountDivider = 1000000000000000000;
+  static const _dashAmountDivider = 100000000;
+  static const _bitcoinCashAmountDivider = 100000000;
+  static const _bitcoinAmountDivider = 100000000;
+  static const _bitcoinAmountLength = 8;
+  static final _bitcoinAmountFormat = NumberFormat()
+    ..maximumFractionDigits = _bitcoinAmountLength
+    ..minimumFractionDigits = 1;
+  static final _moneroAmountFormat = NumberFormat()
+    ..maximumFractionDigits = _moneroAmountLength
+    ..minimumFractionDigits = 1;
+
+  static double amountIntToDouble(CryptoCurrency cryptoCurrency, int amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroAmountToDouble(amount);
+      case CryptoCurrency.btc:
+        return _bitcoinAmountToDouble(amount);
+      case CryptoCurrency.bch:
+        return _bitcoinCashAmountToDouble(amount);
+      case CryptoCurrency.dash:
+        return _dashAmountToDouble(amount);
+      case CryptoCurrency.eth:
+        return _ethereumAmountToDouble(amount);
+      case CryptoCurrency.ltc:
+        return _litecoinAmountToDouble(amount);
+      default:
+        return null;
+    }
+  }
+
+  static int amountStringToInt(CryptoCurrency cryptoCurrency, String amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroParseAmount(amount);
+      default:
+        return null;
+    }
+  }
+
+  static String amountIntToString(CryptoCurrency cryptoCurrency, int amount) {
+    switch (cryptoCurrency) {
+      case CryptoCurrency.xmr:
+        return _moneroAmountToString(amount);
+      case CryptoCurrency.btc:
+        return _bitcoinAmountToString(amount);
+      default:
+        return null;
+    }
+  }
+
+  static double cryptoAmountToDouble({num amount, num divider}) =>
+      amount / divider;
+
+  static String _moneroAmountToString(int amount) => _moneroAmountFormat.format(
+      cryptoAmountToDouble(amount: amount, divider: _moneroAmountDivider));
+
+  static double _moneroAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _moneroAmountDivider);
+
+  static int _moneroParseAmount(String amount) =>
+      _moneroAmountFormat.parse(amount).toInt();
+
+  static String _bitcoinAmountToString(int amount) =>
+      _bitcoinAmountFormat.format(
+          cryptoAmountToDouble(amount: amount, divider: _bitcoinAmountDivider));
+
+  static double _bitcoinAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _bitcoinAmountDivider);
+
+  static int _doubleToBitcoinAmount(double amount) =>
+      (amount * _bitcoinAmountDivider).toInt();
+
+  static double _bitcoinCashAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _bitcoinCashAmountDivider);
+
+  static double _dashAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _dashAmountDivider);
+
+  static double _ethereumAmountToDouble(num amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _ethereumAmountDivider);
+
+  static double _litecoinAmountToDouble(int amount) =>
+      cryptoAmountToDouble(amount: amount, divider: _litecoinAmountDivider);
+}
--- a/lib/core/amount_validator.dart
+++ b/lib/core/amount_validator.dart
@ -1,6 +1,6 @@
 import 'package:cake_wallet/core/validator.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 class AmountValidator extends TextValidator {
  AmountValidator({WalletType type, bool isAutovalidate = false})
--- a/lib/core/auth_service.dart
+++ b/lib/core/auth_service.dart
@ -1,9 +1,9 @@
-import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/secret_store_key.dart';
+import 'package:cake_wallet/entities/encrypt.dart';

 class AuthService with Store {
  AuthService({this.secureStorage, this.sharedPreferences});
@ -19,7 +19,8 @@ class AuthService with Store {

  Future<bool> canAuthenticate() async {
    final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
-    final walletName = sharedPreferences.getString('current_wallet_name') ?? '';
+    final walletName =
+        sharedPreferences.getString(PreferencesKey.currentWalletName) ?? '';
    var password = '';

    try {
--- a/lib/core/contact_service.dart
+++ b/lib/core/contact_service.dart
@ -1,6 +1,6 @@
 import 'package:hive/hive.dart';
 import 'package:cake_wallet/store/contact_list_store.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
+import 'package:cake_wallet/entities/contact.dart';

 class ContactService {
  ContactService(this.contactSource, this.contactListStore) {
--- a/lib/core/execution_state.dart
+++ b/lib/core/execution_state.dart
@ -0,0 +1,13 @@
+abstract class ExecutionState {}
+
+class InitialExecutionState extends ExecutionState {}
+
+class IsExecutingState extends ExecutionState {}
+
+class ExecutedSuccessfullyState extends ExecutionState {}
+
+class FailureState extends ExecutionState {
+  FailureState(this.error);
+
+  final String error;
+}
--- a/lib/src/domain/common/fetch_price.dart
+++ b/lib/src/domain/common/fetch_price.dart
@ -1,13 +1,16 @@
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'dart:convert';
+import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/currency_formatter.dart';
+import 'package:cake_wallet/entities/currency_formatter.dart';

 const fiatApiAuthority = 'fiat-api.cakewallet.com';
 const fiatApiPath = '/v1/rates';

-Future<double> fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async {
+Future<double> _fetchPrice(Map<String, dynamic> args) async {
+  final crypto = args['crypto'] as CryptoCurrency;
+  final fiat = args['fiat'] as FiatCurrency;
  double price = 0.0;

  try {
@ -35,3 +38,12 @@ Future<double> fetchPriceFor({CryptoCurrency crypto, FiatCurrency fiat}) async {
    return price;
  }
 }
+
+Future<double> _fetchPriceAsync(
+        CryptoCurrency crypto, FiatCurrency fiat) async =>
+    compute(_fetchPrice, {'fiat': fiat, 'crypto': crypto});
+
+class FiatConversionService {
+  static Future<double> fetchPrice(CryptoCurrency crypto, FiatCurrency fiat) async =>
+      await _fetchPriceAsync(crypto, fiat);
+}
--- a/lib/core/generate_wallet_password.dart
+++ b/lib/core/generate_wallet_password.dart
@ -1,6 +1,6 @@
 import 'package:uuid/uuid.dart';
 import 'package:cake_wallet/bitcoin/key.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 String generateWalletPassword(WalletType type) {
  switch (type) {
--- a/lib/core/key_service.dart
+++ b/lib/core/key_service.dart
@ -1,6 +1,6 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:cake_wallet/src/domain/common/secret_store_key.dart';
-import 'package:cake_wallet/src/domain/common/encrypt.dart';
+import 'package:cake_wallet/entities/secret_store_key.dart';
+import 'package:cake_wallet/entities/encrypt.dart';

 class KeyService {
  KeyService(this._secureStorage);
--- a/lib/core/mnemonic_length.dart
+++ b/lib/core/mnemonic_length.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 const bitcoinMnemonicLength = 12;
 const moneroMnemonicLength = 25;
--- a/lib/core/monero_account_label_validator.dart
+++ b/lib/core/monero_account_label_validator.dart
@ -1,7 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';

 class MoneroLabelValidator extends TextValidator {
  MoneroLabelValidator({@required CryptoCurrency type})
--- a/lib/core/seed_validator.dart
+++ b/lib/core/seed_validator.dart
@ -1,15 +1,16 @@
 import 'package:bip39/src/wordlists/english.dart' as bitcoin_english;
 import 'package:cake_wallet/core/validator.dart';
-import 'package:cake_wallet/src/domain/common/mnemonic_item.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/chinese_simplified.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/dutch.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/english.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/german.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/japanese.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/portuguese.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/russian.dart';
-import 'package:cake_wallet/src/domain/monero/mnemonics/spanish.dart';
+import 'package:cake_wallet/entities/mnemonic_item.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/monero/mnemonics/chinese_simplified.dart';
+import 'package:cake_wallet/monero/mnemonics/dutch.dart';
+import 'package:cake_wallet/monero/mnemonics/english.dart';
+import 'package:cake_wallet/monero/mnemonics/german.dart';
+import 'package:cake_wallet/monero/mnemonics/japanese.dart';
+import 'package:cake_wallet/monero/mnemonics/portuguese.dart';
+import 'package:cake_wallet/monero/mnemonics/russian.dart';
+import 'package:cake_wallet/monero/mnemonics/spanish.dart';
+import 'package:cake_wallet/utils/language_list.dart';

 class SeedValidator extends Validator<MnemonicItem> {
  SeedValidator({this.type, this.language})
@ -31,31 +32,29 @@ class SeedValidator extends Validator<MnemonicItem> {
  }

  static List<String> getMoneroWordList(String language) {
-    // FIXME: Unnamed constants; Need to be sure that string are in same case;
-
    switch (language) {
-      case 'English':
+      case LanguageList.english:
        return EnglishMnemonics.words;
        break;
-      case 'Chinese (simplified)':
+      case LanguageList.chineseSimplified:
        return ChineseSimplifiedMnemonics.words;
        break;
-      case 'Dutch':
+      case LanguageList.dutch:
        return DutchMnemonics.words;
        break;
-      case 'German':
+      case LanguageList.german:
        return GermanMnemonics.words;
        break;
-      case 'Japanese':
+      case LanguageList.japanese:
        return JapaneseMnemonics.words;
        break;
-      case 'Portuguese':
+      case LanguageList.portuguese:
        return PortugueseMnemonics.words;
        break;
-      case 'Russian':
+      case LanguageList.russian:
        return RussianMnemonics.words;
        break;
-      case 'Spanish':
+      case LanguageList.spanish:
        return SpanishMnemonics.words;
        break;
      default:
@ -64,7 +63,7 @@ class SeedValidator extends Validator<MnemonicItem> {
  }

  static List<String> getBitcoinWordList(String language) {
-    assert(language.toLowerCase() == 'english');
+    assert(language.toLowerCase() == LanguageList.english.toLowerCase());
    return bitcoin_english.WORDLIST;
  }

--- a/lib/core/transaction_history.dart
+++ b/lib/core/transaction_history.dart
@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/src/domain/common/transaction_info.dart';
+import 'package:cake_wallet/entities/transaction_info.dart';

 abstract class TransactionHistoryBase<TransactionType extends TransactionInfo> {
  TransactionHistoryBase() : _isUpdating = false;
@ -10,15 +10,17 @@ abstract class TransactionHistoryBase<TransactionType extends TransactionInfo> {

  bool _isUpdating;

+  @action
  Future<void> update() async {
    if (_isUpdating) {
      return;
    }

    try {
-      _isUpdating = false;
-      transactions.addAll(await fetchTransactions());
      _isUpdating = true;
+      final _transactions = await fetchTransactions();
+      _transactions.forEach((key, value) => transactions[key] = value);
+      _isUpdating = false;
    } catch (e) {
      _isUpdating = false;
      rethrow;
--- a/lib/core/wallet_base.dart
+++ b/lib/core/wallet_base.dart
@ -1,24 +1,39 @@
 import 'package:flutter/foundation.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/core/pending_transaction.dart';
 import 'package:cake_wallet/core/transaction_history.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/sync_status.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/currency_for_wallet_type.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/sync_status.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 abstract class WalletBase<BalaceType> {
-  WalletType type;
+  WalletBase(this.walletInfo);

-  CryptoCurrency currency;
+  static String idFor(String name, WalletType type) =>
+      walletTypeToString(type).toLowerCase() + '_' + name;

-  String get name;
+  WalletInfo walletInfo;

-  String address;
+  WalletType get type => walletInfo.type;

-  BalaceType balance;
+  CryptoCurrency get currency => currencyForWalletType(type);

-  SyncStatus syncStatus;
+  String get id => walletInfo.id;
+
+  String get name => walletInfo.name;
+
+  String get address;
+
+  set address(String address);
+
+  BalaceType get balance;
+
+  SyncStatus get syncStatus;
+
+  set syncStatus(SyncStatus status);

  String get seed;

@ -26,8 +41,6 @@ abstract class WalletBase<BalaceType> {

  TransactionHistoryBase transactionHistory;

-  String get id => walletTypeToString(type).toLowerCase() + '_' + name;
-
  Future<void> connectToNode({@required Node node});

  Future<void> startSync();
@ -37,4 +50,6 @@ abstract class WalletBase<BalaceType> {
  double calculateEstimatedFee(TransactionPriority priority);

  Future<void> save();
+
+  Future<void> rescan({int height});
 }
--- a/lib/core/wallet_creation_service.dart
+++ b/lib/core/wallet_creation_service.dart
@ -1,19 +1,17 @@
+import 'package:cake_wallet/di.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/core/wallet_base.dart';
 import 'package:cake_wallet/core/generate_wallet_password.dart';
-import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/core/wallet_credentials.dart';
-import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
-import 'package:cake_wallet/monero/monero_wallet_service.dart';
 import 'package:cake_wallet/core/wallet_service.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 class WalletCreationService {
  WalletCreationService(
      {WalletType initialType,
-      this.appStore,
      this.secureStorage,
      this.keyService,
      this.sharedPreferences})
@ -24,7 +22,6 @@ class WalletCreationService {
  }

  WalletType type;
-  final AppStore appStore;
  final FlutterSecureStorage secureStorage;
  final SharedPreferences sharedPreferences;
  final KeyService keyService;
@ -32,46 +29,30 @@ class WalletCreationService {

  void changeWalletType({@required WalletType type}) {
    this.type = type;
-
-    switch (type) {
-      case WalletType.monero:
-        _service = MoneroWalletService();
-        break;
-      case WalletType.bitcoin:
-        _service = BitcoinWalletService();
-        break;
-      default:
-        break;
-    }
+    _service = getIt.get<WalletService>(param1: type);
  }

-  Future<void> create(WalletCredentials credentials) async {
+  Future<WalletBase> create(WalletCredentials credentials) async {
    final password = generateWalletPassword(type);
    credentials.password = password;
    await keyService.saveWalletPassword(
        password: password, walletName: credentials.name);
-    final wallet = await _service.create(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.create(credentials);
  }

-  Future<void> restoreFromKeys(WalletCredentials credentials) async {
+  Future<WalletBase> restoreFromKeys(WalletCredentials credentials) async {
    final password = generateWalletPassword(type);
    credentials.password = password;
    await keyService.saveWalletPassword(
        password: password, walletName: credentials.name);
-    final wallet = await _service.restoreFromKeys(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.restoreFromKeys(credentials);
  }

-  Future<void> restoreFromSeed(WalletCredentials credentials) async {
+  Future<WalletBase> restoreFromSeed(WalletCredentials credentials) async {
    final password = generateWalletPassword(type);
    credentials.password = password;
    await keyService.saveWalletPassword(
        password: password, walletName: credentials.name);
-    final wallet = await _service.restoreFromSeed(credentials);
-    appStore.wallet = wallet;
-    appStore.authenticationStore.allowed();
+    return await _service.restoreFromSeed(credentials);
  }
 }
--- a/lib/core/wallet_credentials.dart
+++ b/lib/core/wallet_credentials.dart
@ -1,6 +1,10 @@
+import 'package:cake_wallet/entities/wallet_info.dart';
+
 abstract class WalletCredentials {
-  WalletCredentials({this.name, this.password});
+  WalletCredentials({this.name, this.password, this.height});

  final String name;
+  final int height;
  String password;
-}
+  WalletInfo walletInfo;
+}
--- a/lib/di.dart
+++ b/lib/di.dart
@ -1,16 +1,24 @@
+import 'package:cake_wallet/bitcoin/bitcoin_wallet_service.dart';
 import 'package:cake_wallet/core/contact_service.dart';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/core/wallet_service.dart';
+import 'package:cake_wallet/entities/biometric_auth.dart';
+import 'package:cake_wallet/monero/monero_wallet_service.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+
+// import 'package:cake_wallet/src/domain/services/wallet_service.dart';
 import 'package:cake_wallet/src/screens/contact/contact_list_page.dart';
 import 'package:cake_wallet/src/screens/contact/contact_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
 import 'package:cake_wallet/src/screens/nodes/node_create_or_edit_page.dart';
 import 'package:cake_wallet/src/screens/nodes/nodes_list_page.dart';
+import 'package:cake_wallet/src/screens/rescan/rescan_page.dart';
 import 'package:cake_wallet/src/screens/seed/wallet_seed_page.dart';
 import 'package:cake_wallet/src/screens/send/send_template_page.dart';
 import 'package:cake_wallet/src/screens/settings/settings.dart';
+import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_page.dart';
 import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
@ -20,7 +28,7 @@ import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/monero/monero_wallet.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_list_page.dart';
 import 'package:cake_wallet/src/screens/monero_accounts/monero_account_edit_or_create_page.dart';
 import 'package:cake_wallet/src/screens/auth/auth_page.dart';
@ -38,6 +46,8 @@ import 'package:cake_wallet/view_model/contact_list/contact_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
+import 'package:cake_wallet/view_model/rescan_view_model.dart';
+import 'package:cake_wallet/view_model/setup_pin_code_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart';
 import 'package:cake_wallet/view_model/auth_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@ -52,6 +62,7 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
 import 'package:cake_wallet/view_model/exchange/exchange_view_model.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
 import 'package:get_it/get_it.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@ -61,51 +72,20 @@ import 'package:cake_wallet/view_model/wallet_restoration_from_seed_vm.dart';
 import 'package:cake_wallet/view_model/wallet_restoration_from_keys_vm.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
 import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/dashboard/trades_store.dart';
 import 'package:cake_wallet/store/dashboard/trade_filter_store.dart';
 import 'package:cake_wallet/store/dashboard/transaction_filter_store.dart';
-import 'package:cake_wallet/store/dashboard/fiat_convertation_store.dart';
+import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cake_wallet/store/templates/send_template_store.dart';
 import 'package:cake_wallet/store/templates/exchange_template_store.dart';
-import 'package:cake_wallet/src/domain/common/template.dart';
-import 'package:cake_wallet/src/domain/exchange/exchange_template.dart';
+import 'package:cake_wallet/entities/template.dart';
+import 'package:cake_wallet/exchange/exchange_template.dart';

 final getIt = GetIt.instance;

-// FIXME: Move me.
-
-Stream<BoxEvent> _onNodesSourceChange;
-NodeListStore _nodeListStore;
-
-NodeListStore setupNodeListStore(Box<Node> nodeSource) {
-  if (_nodeListStore != null) {
-    return _nodeListStore;
-  }
-
-  _nodeListStore = NodeListStore();
-  _nodeListStore.replaceValues(nodeSource.values);
-  _onNodesSourceChange = nodeSource.watch();
-  _onNodesSourceChange.listen((event) {
-//    print(event);
-
-    if (event.deleted) {
-      _nodeListStore.nodes.removeWhere((n) {
-        return n.key != null ? n.key == event.key : true;
-      });
-    }
-
-    if (event.value is Node) {
-      final val = event.value as Node;
-      _nodeListStore.nodes.add(val);
-    }
-  });
-
-  return _nodeListStore;
-}
-
 Future setup(
    {Box<WalletInfo> walletInfoSource,
    Box<Node> nodeSource,
@ -118,11 +98,13 @@ Future setup(

  final settingsStore = await SettingsStoreBase.load(nodeSource: nodeSource);

+  getIt.registerSingleton<Box<Node>>(nodeSource);
+
  getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
  getIt.registerSingleton(AuthenticationStore());
  getIt.registerSingleton<WalletListStore>(WalletListStore());
  getIt.registerSingleton(ContactListStore());
-  getIt.registerSingleton(setupNodeListStore(nodeSource));
+  getIt.registerSingleton(NodeListStoreBase.instance);
  getIt.registerSingleton<SettingsStore>(settingsStore);
  getIt.registerSingleton<AppStore>(AppStore(
      authenticationStore: getIt.get<AuthenticationStore>(),
@ -136,7 +118,7 @@ Future setup(
      tradesSource: tradesSource, settingsStore: getIt.get<SettingsStore>()));
  getIt.registerSingleton<TradeFilterStore>(TradeFilterStore());
  getIt.registerSingleton<TransactionFilterStore>(TransactionFilterStore());
-  getIt.registerSingleton<FiatConvertationStore>(FiatConvertationStore());
+  getIt.registerSingleton<FiatConversionStore>(FiatConversionStore());
  getIt.registerSingleton<SendTemplateStore>(
      SendTemplateStore(templateSource: templates));
  getIt.registerSingleton<ExchangeTemplateStore>(
@ -148,13 +130,12 @@ Future setup(
  getIt.registerFactoryParam<WalletCreationService, WalletType, void>(
      (type, _) => WalletCreationService(
          initialType: type,
-          appStore: getIt.get<AppStore>(),
          keyService: getIt.get<KeyService>(),
          secureStorage: getIt.get<FlutterSecureStorage>(),
          sharedPreferences: getIt.get<SharedPreferences>()));

  getIt.registerFactoryParam<WalletNewVM, WalletType, void>((type, _) =>
-      WalletNewVM(
+      WalletNewVM(getIt.get<AppStore>(),
          getIt.get<WalletCreationService>(param1: type), walletInfoSource,
          type: type));

@ -164,7 +145,7 @@ Future setup(
    final language = args[1] as String;
    final mnemonic = args[2] as String;

-    return WalletRestorationFromSeedVM(
+    return WalletRestorationFromSeedVM(getIt.get<AppStore>(),
        getIt.get<WalletCreationService>(param1: type), walletInfoSource,
        type: type, language: language, seed: mnemonic);
  });
@ -174,7 +155,7 @@ Future setup(
    final type = args.first as WalletType;
    final language = args[1] as String;

-    return WalletRestorationFromKeysVM(
+    return WalletRestorationFromKeysVM(getIt.get<AppStore>(),
        getIt.get<WalletCreationService>(param1: type), walletInfoSource,
        type: type, language: language);
  });
@ -185,7 +166,7 @@ Future setup(
  getIt.registerFactory(() => BalanceViewModel(
      wallet: getIt.get<AppStore>().wallet,
      settingsStore: getIt.get<SettingsStore>(),
-      fiatConvertationStore: getIt.get<FiatConvertationStore>()));
+      fiatConvertationStore: getIt.get<FiatConversionStore>()));

  getIt.registerFactory(() => DashboardViewModel(
      balanceViewModel: getIt.get<BalanceViewModel>(),
@ -199,38 +180,24 @@ Future setup(
      sharedPreferences: getIt.get<SharedPreferences>()));

  getIt.registerFactory<AuthViewModel>(() => AuthViewModel(
-      authService: getIt.get<AuthService>(),
-      sharedPreferences: getIt.get<SharedPreferences>()));
+      getIt.get<AuthService>(),
+      getIt.get<SharedPreferences>(),
+      getIt.get<SettingsStore>(),
+      BiometricAuth()));

  getIt.registerFactory<AuthPage>(
-      () => AuthPage(
-          allowBiometricalAuthentication: getIt
-              .get<AppStore>()
-              .settingsStore
-              .allowBiometricalAuthentication,
-          authViewModel: getIt.get<AuthViewModel>(),
-          onAuthenticationFinished: (isAuthenticated, __) {
+      () => AuthPage(getIt.get<AuthViewModel>(),
+              onAuthenticationFinished: (isAuthenticated, __) {
            if (isAuthenticated) {
              getIt.get<AuthenticationStore>().allowed();
            }
-          },
-          closable: false),
+          }, closable: false),
      instanceName: 'login');

  getIt
      .registerFactoryParam<AuthPage, void Function(bool, AuthPageState), void>(
-          (onAuthFinished, _) {
-    final allowBiometricalAuthentication =
-        getIt.get<AppStore>().settingsStore.allowBiometricalAuthentication;
-
-    print('allowBiometricalAuthentication $allowBiometricalAuthentication');
-
-    return AuthPage(
-        allowBiometricalAuthentication: allowBiometricalAuthentication,
-        authViewModel: getIt.get<AuthViewModel>(),
-        onAuthenticationFinished: onAuthFinished,
-        closable: false);
-  });
+          (onAuthFinished, _) => AuthPage(getIt.get<AuthViewModel>(),
+              onAuthenticationFinished: onAuthFinished, closable: false));

  getIt.registerFactory<DashboardPage>(() => DashboardPage(
      walletViewModel: getIt.get<DashboardViewModel>(),
@ -252,13 +219,13 @@ Future setup(
  getIt.registerFactory<SendViewModel>(() => SendViewModel(
      getIt.get<AppStore>().wallet,
      getIt.get<AppStore>().settingsStore,
-      getIt.get<FiatConvertationStore>()));
+      getIt.get<FiatConversionStore>()));

  getIt.registerFactory(
      () => SendPage(sendViewModel: getIt.get<SendViewModel>()));

  getIt.registerFactory(
-           () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));
+      () => SendTemplatePage(sendViewModel: getIt.get<SendViewModel>()));

  getIt.registerFactory(() => WalletListViewModel(
      walletInfoSource, getIt.get<AppStore>(), getIt.get<KeyService>()));
@ -305,10 +272,10 @@ Future setup(
  getIt
      .registerFactory(() => WalletSeedViewModel(getIt.get<AppStore>().wallet));

-  getIt.registerFactoryParam<WalletSeedPage, VoidCallback, void>(
-      (VoidCallback callback, _) => WalletSeedPage(
+  getIt.registerFactoryParam<WalletSeedPage, bool, void>(
+      (bool isWalletCreated, _) => WalletSeedPage(
          getIt.get<WalletSeedViewModel>(),
-          onCloseCallback: callback));
+          isNewWalletCreated: isWalletCreated));

  getIt
      .registerFactory(() => WalletKeysViewModel(getIt.get<AppStore>().wallet));
@ -367,6 +334,35 @@ Future setup(

  getIt.registerFactory(
      () => ExchangeTemplatePage(getIt.get<ExchangeViewModel>()));
+
+  getIt.registerFactory(() => MoneroWalletService(walletInfoSource));
+
+  getIt.registerFactory(() => BitcoinWalletService());
+
+  getIt.registerFactoryParam<WalletService, WalletType, void>(
+      (WalletType param1, __) {
+    switch (param1) {
+      case WalletType.monero:
+        return getIt.get<MoneroWalletService>();
+      case WalletType.bitcoin:
+        return getIt.get<BitcoinWalletService>();
+      default:
+        return null;
+    }
+  });
+
+  getIt.registerFactory<SetupPinCodeViewModel>(() => SetupPinCodeViewModel(
+      getIt.get<AuthService>(), getIt.get<SettingsStore>()));
+
+  getIt.registerFactoryParam<SetupPinCodePage,
+          void Function(BuildContext, String), void>(
+      (onSuccessfulPinSetup, _) => SetupPinCodePage(
+          getIt.get<SetupPinCodeViewModel>(),
+          onSuccessfulPinSetup: onSuccessfulPinSetup));
+
+  getIt.registerFactory(() => RescanViewModel(getIt.get<AppStore>().wallet));
+
+  getIt.registerFactory(() => RescanPage(getIt.get<RescanViewModel>()));
 }

 void setupThemeChangerStore(ThemeChanger themeChanger) {
--- a/lib/src/stores/action_list/action_list_display_mode.dart
+++ b/lib/src/stores/action_list/action_list_display_mode.dart
--- a/lib/src/domain/common/balance.dart
+++ b/lib/src/domain/common/balance.dart
--- a/lib/src/domain/common/balance_display_mode.dart
+++ b/lib/src/domain/common/balance_display_mode.dart
@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';

 class BalanceDisplayMode extends EnumerableItem<int> with Serializable<int> {
  const BalanceDisplayMode({@required String title, @required int raw})
--- a/lib/src/domain/common/biometric_auth.dart
+++ b/lib/src/domain/common/biometric_auth.dart
--- a/lib/src/domain/common/calculate_estimated_fee.dart
+++ b/lib/src/domain/common/calculate_estimated_fee.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';

 double calculateEstimatedFee({TransactionPriority priority}) {
  if (priority == TransactionPriority.slow) {
--- a/lib/src/domain/common/calculate_fiat_amount.dart
+++ b/lib/src/domain/common/calculate_fiat_amount.dart
--- a/lib/src/domain/common/calculate_fiat_amount_raw.dart
+++ b/lib/src/domain/common/calculate_fiat_amount_raw.dart
--- a/lib/src/domain/common/contact.dart
+++ b/lib/src/domain/common/contact.dart
@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/utils/mobx.dart';

 part 'contact.g.dart';
--- a/lib/src/domain/common/contact_model.dart
+++ b/lib/src/domain/common/contact_model.dart
@ -1,7 +1,7 @@
 // import 'package:hive/hive.dart';
 // import 'package:mobx/mobx.dart';
-// import 'package:cake_wallet/src/domain/common/contact.dart';
-// import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+// import 'package:cake_wallet/entities/contact.dart';
+// import 'package:cake_wallet/entities/crypto_currency.dart';

 // part 'contact_model.g.dart';

--- a/lib/src/domain/common/crypto_amount_format.dart
+++ b/lib/src/domain/common/crypto_amount_format.dart
--- a/lib/src/domain/common/crypto_currency.dart
+++ b/lib/src/domain/common/crypto_currency.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';
 import 'package:hive/hive.dart';

 part 'crypto_currency.g.dart';
--- a/lib/entities/currency_for_wallet_type.dart
+++ b/lib/entities/currency_for_wallet_type.dart
@ -0,0 +1,13 @@
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+
+CryptoCurrency currencyForWalletType(WalletType type) {
+  switch (type) {
+    case WalletType.bitcoin:
+      return CryptoCurrency.btc;
+    case WalletType.monero:
+      return CryptoCurrency.xmr;
+    default:
+      return null;
+  }
+}
--- a/lib/src/domain/common/currency_formatter.dart
+++ b/lib/src/domain/common/currency_formatter.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';

 String cryptoToString(CryptoCurrency crypto) {
  switch (crypto) {
--- a/lib/src/domain/common/default_settings_migration.dart
+++ b/lib/src/domain/common/default_settings_migration.dart
@ -1,13 +1,13 @@
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/store/settings_store.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/balance_display_mode.dart';
-import 'package:cake_wallet/src/domain/common/fiat_currency.dart';
-import 'package:cake_wallet/src/domain/common/node_list.dart';
-import 'package:cake_wallet/src/domain/common/transaction_priority.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/balance_display_mode.dart';
+import 'package:cake_wallet/entities/fiat_currency.dart';
+import 'package:cake_wallet/entities/node_list.dart';
+import 'package:cake_wallet/entities/transaction_priority.dart';

 Future defaultSettingsMigration(
    {@required int version,
@ -29,13 +29,13 @@ Future defaultSettingsMigration(
      switch (version) {
        case 1:
          await sharedPreferences.setString(
-              SettingsStoreBase.currentFiatCurrencyKey,
+              PreferencesKey.currentFiatCurrencyKey,
              FiatCurrency.usd.toString());
          await sharedPreferences.setInt(
-              SettingsStoreBase.currentTransactionPriorityKey,
+              PreferencesKey.currentTransactionPriorityKey,
              TransactionPriority.standart.raw);
          await sharedPreferences.setInt(
-              SettingsStoreBase.currentBalanceDisplayModeKey,
+              PreferencesKey.currentBalanceDisplayModeKey,
              BalanceDisplayMode.availableBalance.raw);
          await sharedPreferences.setBool('save_recipient_address', true);
          await resetToDefault(nodes);
--- a/lib/src/domain/common/digest_request.dart
+++ b/lib/src/domain/common/digest_request.dart
--- a/lib/src/domain/common/encrypt.dart
+++ b/lib/src/domain/common/encrypt.dart
--- a/lib/src/domain/common/enumerable_item.dart
+++ b/lib/src/domain/common/enumerable_item.dart
--- a/lib/src/domain/common/fiat_currency.dart
+++ b/lib/src/domain/common/fiat_currency.dart
@ -1,4 +1,4 @@
-import 'package:cake_wallet/src/domain/common/enumerable_item.dart';
+import 'package:cake_wallet/entities/enumerable_item.dart';

 class FiatCurrency extends EnumerableItem<String> with Serializable<String> {
  const FiatCurrency({String symbol}) : super(title: symbol, raw: symbol);
--- a/lib/src/domain/common/format_amount.dart
+++ b/lib/src/domain/common/format_amount.dart
--- a/lib/src/domain/common/fs_migration.dart
+++ b/lib/src/domain/common/fs_migration.dart
@ -1,10 +1,10 @@
 import 'dart:io';
 import 'dart:convert';
-import 'package:cake_wallet/src/domain/common/contact.dart';
-import 'package:cake_wallet/src/domain/common/crypto_currency.dart';
-import 'package:cake_wallet/src/domain/common/wallet_info.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/exchange/trade.dart';
+import 'package:cake_wallet/entities/contact.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
+import 'package:cake_wallet/entities/wallet_info.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/exchange/trade.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:path_provider/path_provider.dart';
@ -82,28 +82,28 @@ Future<void> migrate_wallets({Directory appDocDir}) async {
 Future<void> migrate_ios_wallet_info(
    {@required Directory appDocDir,
    @required Box<WalletInfo> walletsInfo}) async {
-  final walletsDir = Directory('${appDocDir.path}/wallets');
-  final moneroWalletsDir = Directory('${walletsDir.path}/monero');
+  // final walletsDir = Directory('${appDocDir.path}/wallets');
+  // final moneroWalletsDir = Directory('${walletsDir.path}/monero');

-  moneroWalletsDir.listSync().forEach((item) async {
-    try {
-      if (item is Directory) {
-        final name = item.path.split('/').last;
-        final configFile = File('${item.path}/$name.json');
-        final config =
-            json.decode(configFile.readAsStringSync()) as Map<String, dynamic>;
-        final isRecovery = config["isRecovery"] as bool ?? false;
-        final id =
-            walletTypeToString(WalletType.monero).toLowerCase() + '_' + name;
-        final walletInfo =
-            WalletInfo(id: id, name: name, isRecovery: isRecovery);
+  // moneroWalletsDir.listSync().forEach((item) async {
+  //   try {
+  //     if (item is Directory) {
+  //       final name = item.path.split('/').last;
+  //       final configFile = File('${item.path}/$name.json');
+  //       final config =
+  //           json.decode(configFile.readAsStringSync()) as Map<String, dynamic>;
+  //       final isRecovery = config["isRecovery"] as bool ?? false;
+  //       final id =
+  //           walletTypeToString(WalletType.monero).toLowerCase() + '_' + name;
+  //       final walletInfo =
+  //           WalletInfo(id: id, name: name, isRecovery: isRecovery);

-        await walletsInfo.add(walletInfo);
-      }
-    } catch (e) {
-      print(e.toString());
-    }
-  });
+  //       await walletsInfo.add(walletInfo);
+  //     }
+  //   } catch (e) {
+  //     print(e.toString());
+  //   }
+  // });
 }

 Future<void> migrate_ios_trades_list(
--- a/lib/src/domain/common/get_encryption_key.dart
+++ b/lib/src/domain/common/get_encryption_key.dart
--- a/lib/entities/ios_legacy_helper.dart
+++ b/lib/entities/ios_legacy_helper.dart
@ -0,0 +1,15 @@
+import 'dart:async';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+const platform =
+    const MethodChannel('com.cakewallet.cakewallet/legacy_wallet_migration');
+
+Future<String> readTradeList(
+        {@required String key, @required String salt}) async =>
+    await platform.invokeMethod('read_trade_list', {'key': key, 'salt': salt});
+
+Future<String> readEncryptedFile(String url,
+        {@required String key, @required String salt}) async =>
+    await platform.invokeMethod(
+        'read_encrypted_file', {'url': url, 'key': key, 'salt': salt});
--- a/lib/src/domain/common/language.dart
+++ b/lib/src/domain/common/language.dart
--- a/lib/entities/load_current_wallet.dart
+++ b/lib/entities/load_current_wallet.dart
@ -0,0 +1,23 @@
+import 'package:cake_wallet/di.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cake_wallet/core/key_service.dart';
+import 'package:cake_wallet/core/wallet_service.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+
+Future<void> loadCurrentWallet() async {
+  final appStore = getIt.get<AppStore>();
+  final name = getIt
+      .get<SharedPreferences>()
+      .getString(PreferencesKey.currentWalletName);
+  final typeRaw =
+      getIt.get<SharedPreferences>().getInt(PreferencesKey.currentWalletType) ??
+          0;
+  final type = deserializeFromInt(typeRaw);
+  final password =
+      await getIt.get<KeyService>().getWalletPassword(walletName: name);
+  final _service = getIt.get<WalletService>(param1: type);
+  final wallet = await _service.openWallet(name, password);
+  appStore.wallet = wallet;
+}
--- a/lib/src/domain/common/mnemonic_item.dart
+++ b/lib/src/domain/common/mnemonic_item.dart
--- a/lib/src/domain/common/node.dart
+++ b/lib/src/domain/common/node.dart
@ -3,8 +3,8 @@ import 'package:flutter/foundation.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:hive/hive.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
-import 'package:cake_wallet/src/domain/common/digest_request.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';
+import 'package:cake_wallet/entities/digest_request.dart';

 part 'node.g.dart';

--- a/lib/src/domain/common/node_list.dart
+++ b/lib/src/domain/common/node_list.dart
@ -1,8 +1,8 @@
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import "package:yaml/yaml.dart";
-import 'package:cake_wallet/src/domain/common/node.dart';
-import 'package:cake_wallet/src/domain/common/wallet_type.dart';
+import 'package:cake_wallet/entities/node.dart';
+import 'package:cake_wallet/entities/wallet_type.dart';

 Future<List<Node>> loadDefaultNodes() async {
  final nodesRaw = await rootBundle.loadString('assets/node_list.yml');
--- a/lib/src/domain/common/openalias_record.dart
+++ b/lib/src/domain/common/openalias_record.dart
--- a/lib/src/domain/common/parseBoolFromString.dart
+++ b/lib/src/domain/common/parseBoolFromString.dart
--- a/Show more
+++ b/Show more