From 13b64ebb47bf311f8a1e3c3b663e419b612b40aa Mon Sep 17 00:00:00 2001
From: Michael Scoff <thetrustwallet@gmail.com>
Date: Sat, 14 Oct 2017 15:19:29 -0700
Subject: [PATCH] Making sure chainID always > 0

---
 Trust/Settings/Types/Config.swift | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Trust/Settings/Types/Config.swift b/Trust/Settings/Types/Config.swift
index 234385eea8..0a7f7e9cd0 100644
--- a/Trust/Settings/Types/Config.swift
+++ b/Trust/Settings/Types/Config.swift
@@ -6,21 +6,27 @@ struct Config {
 
     struct Keys {
         static let chainID = "chainID"
-        static let isFiatPrimaryCurrency = "isFiatPrimaryCurrency"
+        static let isCryptoPrimaryCurrency = "isCryptoPrimaryCurrency"
     }
 
-    static let defaults = UserDefaults.standard
+    let defaults: UserDefaults
 
-    var chainID: Int = Config.defaults.integer(forKey: Keys.chainID) {
-        didSet {
-            Config.defaults.set(chainID, forKey: Keys.chainID)
-        }
+    init(defaults: UserDefaults = UserDefaults.standard) {
+        self.defaults = defaults
     }
 
-    var isFiatPrimaryCurrency: Bool = Config.defaults.bool(forKey: Keys.isFiatPrimaryCurrency) {
-        didSet {
-            Config.defaults.set(isFiatPrimaryCurrency, forKey: Keys.isFiatPrimaryCurrency)
+    var chainID: Int {
+        get {
+            let id = defaults.integer(forKey: Keys.chainID)
+            guard id > 0 else { return RPCServer.main.chainID }
+            return id
         }
+        set { defaults.set(newValue, forKey: Keys.chainID) }
+    }
+
+    var isCryptoPrimaryCurrency: Bool {
+        get { return defaults.bool(forKey: Keys.isCryptoPrimaryCurrency) }
+        set { defaults.set(newValue, forKey: Keys.isCryptoPrimaryCurrency) }
     }
 
     var server: RPCServer {