Merge branch 'master' into display-eth-appreciation

Trust.xcodeproj/project.pbxproj

@@ -301,7 +301,6 @@
 		5E7C72C8A15397C5A40BFE76 /* WhatIsEthereumInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */; };
 		5E7C72E1D4B4B4C8443F3DA1 /* SendHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7828BD821B6F04B71C00 /* SendHeaderView.swift */; };
 		5E7C731B88842C036A74A039 /* AlphaWalletSettingsButtonRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C71EBD4C95AD4E11F3352 /* AlphaWalletSettingsButtonRow.swift */; };
-		5E7C73305DF984B99E94D9F9 /* ShareModeButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */; };
 		5E7C733638D7596F93DEE2A9 /* OnboardingCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CE3F1D6B7993E7A840 /* OnboardingCollectionViewController.swift */; };
 		5E7C7376B566E5A59CC8F463 /* ImportTicketViewControllerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C72D0E7CA03ADE5CFAE7A /* ImportTicketViewControllerViewModel.swift */; };
 		5E7C73FC3990D110C474C3D6 /* WalletFilterViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E7C75CC640BAFFE0E789F44 /* WalletFilterViewModel.swift */; };
@@ -842,7 +841,6 @@
 		5E7C76AF81B8DFF605558499 /* UniversalLinkCoordinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UniversalLinkCoordinator.swift; sourceTree = "<group>"; };
 		5E7C76D3CFA12C2236E73E10 /* TransferTicketsViaWalletAddressViewControllerViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransferTicketsViaWalletAddressViewControllerViewModel.swift; sourceTree = "<group>"; };
 		5E7C77061BEF269BCE358086 /* BaseTicketTableViewCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseTicketTableViewCellViewModel.swift; sourceTree = "<group>"; };
-		5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareModeButton.swift; sourceTree = "<group>"; };
 		5E7C77316522DF2B256F1F92 /* TicketsViewControllerHeaderViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketsViewControllerHeaderViewModel.swift; sourceTree = "<group>"; };
 		5E7C7742709724B3BD0C2A0D /* TicketRowViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TicketRowViewModel.swift; sourceTree = "<group>"; };
 		5E7C774BCA281E4B077DBBFA /* WhatIsEthereumInfoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WhatIsEthereumInfoViewController.swift; sourceTree = "<group>"; };
@@ -2419,7 +2417,6 @@
 		5E7C7F64537949FBD3F77457 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				5E7C7717D829205D1E254AC1 /* ShareModeButton.swift */,
 				5E7C7828BD821B6F04B71C00 /* SendHeaderView.swift */,
 			);
 			path = Views;
@@ -3587,7 +3584,6 @@
 				5E7C776BE1B19F824954962D /* BaseTicketTableViewCell.swift in Sources */,
 				5E7C7C0FAC500A6651E663FD /* TransferTicketsQuantitySelectionViewModel.swift in Sources */,
 				5E7C77AD9FAAC18211B6F355 /* TransferTicketsQuantitySelectionViewController.swift in Sources */,
-				5E7C73305DF984B99E94D9F9 /* ShareModeButton.swift in Sources */,
 				5E7C7EEE563D81793CB96FA0 /* TransferTicketsCoordinator.swift in Sources */,
 				5E7C7567A690B6B8F889AE83 /* SendViewController.swift in Sources */,
 				5E7C72E1D4B4B4C8443F3DA1 /* SendHeaderView.swift in Sources */,

Trust/Redeem/Helpers/RedeemEventListener.swift

@@ -35,9 +35,4 @@ class RedeemEventListener {
         shouldListen = false
         RestClient.cancel()
     }
-
-    deinit {
-        print("deinit")
-    }
-
 }

Trust/Redeem/ViewControllers/TicketRedemptionViewController.swift

@@ -136,10 +136,6 @@ class TicketRedemptionViewController: UIViewController {
         }
     }
     
-    deinit {
-        print("deinit called")
-    }
-
     func configure(viewModel: TicketRedemptionViewModel) {
         self.viewModel = viewModel
 

Trust/Settings/Coordinators/HelpUsCoordinator.swift

@@ -31,7 +31,7 @@ class HelpUsCoordinator: Coordinator {
 
     func rateUs() {
         if #available(iOS 10.3, *) { SKStoreReviewController.requestReview() } else {
-            UIApplication.shared.openURL(URL(string: "itms-apps://itunes.apple.com/app/id1288339409")!)
+            UIApplication.shared.openURL(URL(string: Constants.appstoreURL)!)
         }
         appTracker.completedRating = true
     }

Trust/Settings/Types/Constants.swift

@@ -14,6 +14,8 @@ public struct Constants {
     public static let twitterUsername = "Alpha_wallet"
     public static let redditGroupName = "r/AlphaWallet/"
     public static let facebookUsername = "AlphaWallet"
+    //TODO need to change this for launch
+    public static let appstoreURL = "itms-apps://itunes.apple.com/app/id1288339409"
 
     // support
     public static let supportEmail = "support@awallet.io"

Trust/Tokens/ViewControllers/StaticHTMLViewController.swift

@@ -11,6 +11,8 @@ class StaticHTMLViewController: UIViewController {
         view.backgroundColor = Colors.appBackground
 
         webView.backgroundColor = Colors.appBackground
+        //So webview is seethrough to reveal its parents background color when HTML is not loaded yet
+        webView.isOpaque = false
         webView.translatesAutoresizingMaskIntoConstraints = false
         webView.delegate = self
         if let path = url() {