little fixes

MinterTeam · Nov 6, 2019 · e314289 · e314289
1 parent e46ab73
commit e314289
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,7 @@ DerivedData
 
 # Bundler
 .bundle
-
+MinterWalletFabric/
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 # Carthage/Checkouts
 

diff --git a/MinterWallet.xcodeproj/project.pbxproj b/MinterWallet.xcodeproj/project.pbxproj
@@ -51,6 +51,7 @@
 		FA04029320FDD6E000F1689F /* GetCoinsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA04029220FDD6E000F1689F /* GetCoinsViewModel.swift */; };
 		FA0A0DD72371A70B00B83C29 /* UITextViewWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0A0DD62371A70B00B83C29 /* UITextViewWorkaround.swift */; };
 		FA0A0DD82371A70B00B83C29 /* UITextViewWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0A0DD62371A70B00B83C29 /* UITextViewWorkaround.swift */; };
+		FA0A0DDB23732D9D00B83C29 /* RawTransactionRouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0A0DDA23732D9D00B83C29 /* RawTransactionRouterTests.swift */; };
 		FA0AF8DC21B5297E000B571B /* NextGrowingInternalTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0AF8DA21B5297D000B571B /* NextGrowingInternalTextView.swift */; };
 		FA0AF8DD21B5297E000B571B /* NextGrowingTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0AF8DB21B5297D000B571B /* NextGrowingTextView.swift */; };
 		FA0AF8E521B534EF000B571B /* UIImageViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA0AF8DF21B534EF000B571B /* UIImageViewExtension.swift */; };
@@ -650,6 +651,7 @@
 		FA04029020FDD6C600F1689F /* SpendCoinsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpendCoinsViewModel.swift; sourceTree = "<group>"; };
 		FA04029220FDD6E000F1689F /* GetCoinsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetCoinsViewModel.swift; sourceTree = "<group>"; };
 		FA0A0DD62371A70B00B83C29 /* UITextViewWorkaround.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextViewWorkaround.swift; sourceTree = "<group>"; };
+		FA0A0DDA23732D9D00B83C29 /* RawTransactionRouterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RawTransactionRouterTests.swift; sourceTree = "<group>"; };
 		FA0AF8DA21B5297D000B571B /* NextGrowingInternalTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextGrowingInternalTextView.swift; sourceTree = "<group>"; };
 		FA0AF8DB21B5297D000B571B /* NextGrowingTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NextGrowingTextView.swift; sourceTree = "<group>"; };
 		FA0AF8DF21B534EF000B571B /* UIImageViewExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImageViewExtension.swift; sourceTree = "<group>"; };
@@ -1525,6 +1527,14 @@
 			path = Managers;
 			sourceTree = "<group>";
 		};
+		FA0A0DD923732AAA00B83C29 /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+				FA0A0DDA23732D9D00B83C29 /* RawTransactionRouterTests.swift */,
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
 		FA0AF8D921B5291A000B571B /* NextGrowingTextView */ = {
 			isa = PBXGroup;
 			children = (
@@ -1794,6 +1804,7 @@
 		FA669B7E207239F200AD110A /* MinterWalletTests */ = {
 			isa = PBXGroup;
 			children = (
+				FA0A0DD923732AAA00B83C29 /* ViewModels */,
 				FA669B7F207239F200AD110A /* MinterWalletTests.swift */,
 				FA669B81207239F200AD110A /* Info.plist */,
 				FACA694520D7C717006F173F /* MnemonicTests.swift */,
@@ -3276,6 +3287,7 @@
 			files = (
 				FA669B80207239F200AD110A /* MinterWalletTests.swift in Sources */,
 				FACA694620D7C717006F173F /* MnemonicTests.swift in Sources */,
+				FA0A0DDB23732D9D00B83C29 /* RawTransactionRouterTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/MinterWallet/Classes/AppDelegate.swift b/MinterWallet/Classes/AppDelegate.swift
@@ -97,14 +97,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		UIBarButtonItem.appearance().setTitleTextAttributes([
 				NSAttributedStringKey.font: UIFont.defaultFont(of: 14),
 				NSAttributedStringKey.foregroundColor: UIColor.white,
-				NSAttributedStringKey.baselineOffset : 1
+				NSAttributedStringKey.baselineOffset: 1
 			], for: .normal
 		)
 
 		UIBarButtonItem.appearance().setTitleTextAttributes([
 			NSAttributedStringKey.font: UIFont.defaultFont(of: 14),
-			NSAttributedStringKey.foregroundColor : UIColor.white,
-			NSAttributedStringKey.baselineOffset : 1
+			NSAttributedStringKey.foregroundColor: UIColor.white,
+			NSAttributedStringKey.baselineOffset: 1
 			], for: .highlighted
 		)
 
@@ -117,7 +117,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		UINavigationBar.appearance().isTranslucent = false
 
 		UITabBarItem.appearance().setTitleTextAttributes([
-			NSAttributedStringKey.foregroundColor : UIColor(hex: 0x8A8A8F)!,
+			NSAttributedStringKey.foregroundColor: UIColor(hex: 0x8A8A8F)!,
 			NSAttributedStringKey.font : UIFont.mediumFont(of: 11.0)
 		], for: .normal)
 		UITabBarItem.appearance().setTitleTextAttributes([

diff --git a/MinterWalletTests/MnemonicTests.swift b/MinterWalletTests/MnemonicTests.swift
@@ -8,7 +8,6 @@
 
 import XCTest
 import CryptoSwift
-//@testable import MinterCore
 @testable import MinterWallet
 
 class MnemonicTests: XCTestCase {

diff --git a/MinterWalletTests/ViewModels/RawTransactionRouterTests.swift b/MinterWalletTests/ViewModels/RawTransactionRouterTests.swift
@@ -0,0 +1,36 @@
+//
+//  RawTransactionRouterTests.swift
+//  MinterWalletTests
+//
+//  Created by Alexey Sidorov on 06.11.2019.
+//  Copyright © 2019 Minter. All rights reserved.
+//
+
+import Foundation
+import XCTest
+import CryptoSwift
+@testable import MinterWallet
+
+class RawTransactionRouterTests: XCTestCase {
+
+	override func setUp() {
+		super.setUp()
+	}
+
+	override func tearDown() {
+		super.tearDown()
+	}
+
+	func testRouterEmptyParam() {
+		let viewController = RawTransactionRouter.viewController(path: ["tx"], param: [:])
+		XCTAssert(viewController == nil)
+	}
+
+	func testRouterCheck() {
+		let viewController = RawTransactionRouter
+			.viewController(path: ["tx"], param: ["d": "f8bf09b8aef8acb8a9f8a78677617a7a617002843b9ac9ff8a4d4e5400000000000000888ac7230489e80000b841a5e50e3e09b32ed00558ece561aa010f7601856ecf59f945e079f2df61a70ec84c99c2715a11b578f5c06c6bc4ae21697d2138026743db59ba867236ca9ccd8c011ba0183fc4b593d59c00489c2d4f954b66d618979e5f4883f171a4603c40748de566a014b658338e8306b2db92e9d0d8dbc7ecc31d4817040ad73469b93c51be739c7c808080018a4d4e5400000000000000",
+																						"p": "pass"])
+		XCTAssert(viewController != nil)
+	}
+
+}