Merge pull request #35 from kinecosystem/issue-29

Bugfix: issue 29
kinecosystem · Oct 7, 2021 · bb7467a · bb7467a
2 parents d9981e9 + 4017cf5
commit bb7467a
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
+
+# Gem bundle
+/.bundle/
+/vendor/
diff --git a/KinBase.podspec b/KinBase.podspec
@@ -8,7 +8,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'KinBase'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
   s.summary          = 'Kin SDK for iOS'
 
   s.description      = <<-DESC

diff --git a/KinBase/KinBase.xcodeproj/project.pbxproj b/KinBase/KinBase.xcodeproj/project.pbxproj
@@ -1799,7 +1799,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-l\"c++\"",
@@ -1841,7 +1841,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

diff --git a/KinBase/KinBase/Src/Model/KinTransaction.swift b/KinBase/KinBase/Src/Model/KinTransaction.swift
@@ -89,6 +89,10 @@ public class KinTransaction: Equatable, KinTransactionType {
     public var memo: KinMemo
 
     public var paymentOperations: [KinPaymentOperation]
+
+    public enum Errors: Error {
+        case unknown
+    }
 
     init(envelopeXdrBytes: [Byte], record: Record, network: KinNetwork, invoiceList: InvoiceList? = nil, historyItem: APBTransactionV4HistoryItem? = nil) throws {
         self.envelopeXdrBytes = envelopeXdrBytes
@@ -102,9 +106,12 @@ public class KinTransaction: Equatable, KinTransactionType {
             self.memo = solanaTransaction.memo
             self.paymentOperations = solanaTransaction.paymentOperations
         } else {
-            let payments = historyItem!.paymentsArray as NSArray as! [APBTransactionV4HistoryItem_Payment]
+            guard let historyItem = historyItem else {
+                throw Errors.unknown
+            }
+            let payments = historyItem.paymentsArray as NSArray as! [APBTransactionV4HistoryItem_Payment]
             let payment = payments.first!
-            self.transactionHash = KinTransactionHash(historyItem!.transactionId.value)
+            self.transactionHash = KinTransactionHash(historyItem.transactionId.value)
             self.sourceAccount = payment.source.publicKey
             self.memo = KinMemo.none
             self.paymentOperations = payments.compactMap {

diff --git a/KinBase/README.md b/KinBase/README.md
@@ -7,7 +7,7 @@ The KinBase module is the foundation upon which the rest of the SDK stands.
 ## Installation
 Add the following to your Podfile.
 ```
-pod 'KinBase', '~> 2.1.0'
+pod 'KinBase', '~> 2.1.1'
 ```
 
 ## Overview

diff --git a/KinDesign.podspec b/KinDesign.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'KinDesign'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
   s.summary          = 'Kin Design Library for iOS'
 
   s.description      = <<-DESC

diff --git a/KinDesign/KinDesign.xcodeproj/project.pbxproj b/KinDesign/KinDesign.xcodeproj/project.pbxproj
@@ -430,7 +430,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinDesign;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -458,7 +458,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinDesign;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/KinDesign/README.md b/KinDesign/README.md
@@ -10,7 +10,7 @@ All of these components can be tested out and browsed in the [sample app](../Kin
 ## Installation
 Add the following to your project's Podfile.
 ```
-pod 'KinDesign', '~> 2.1.0'
+pod 'KinDesign', '~> 2.1.1'
 ```
 
 ### Primary Button

diff --git a/KinSampleApp/KinSampleApp.xcodeproj/project.pbxproj b/KinSampleApp/KinSampleApp.xcodeproj/project.pbxproj
@@ -580,7 +580,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinSampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -602,7 +602,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinSampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/KinUX.podspec b/KinUX.podspec
@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'KinUX'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
   s.summary          = 'UX Library for Kin SDK iOS'
 
   s.description      = <<-DESC
@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
 
   s.source_files = 'KinUX/KinUX/Src/**/*'
 
-  s.dependency 'KinBase', '~> 2.1.0'
-  s.dependency 'KinDesign', '~> 2.1.0'
+  s.dependency 'KinBase', '~> 2.1.1'
+  s.dependency 'KinDesign', '~> 2.1.1'
 
   # Dependencies needed for KinGrpcApi
   s.dependency 'gRPC-ProtoRPC'

diff --git a/KinUX/KinUX.xcodeproj/project.pbxproj b/KinUX/KinUX.xcodeproj/project.pbxproj
@@ -589,7 +589,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinUX;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -619,7 +619,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = org.kin..KinUX;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/KinUX/README.md b/KinUX/README.md
@@ -6,7 +6,7 @@ The KinUX module provides an easy to use out of the box spend flow UI that is pr
 Add the following to your project's Podfile.
 This will also transitively pull in KinBase and KinDesign into your project as well.
 ```
-pod 'KinUX', '~> 2.1.0'
+pod 'KinUX', '~> 2.1.1'
 ```
 
 ##  Overview

diff --git a/README.md b/README.md
@@ -26,13 +26,13 @@ In your Podfile
 
 ```
 // If you just want to access the blockchain & no UI
-pod 'KinBase', '~> 2.1.0'
+pod 'KinBase', '~> 2.1.1'
 
 // Add spend to use the modal spend flow to allow users to buy things with Kin
-pod 'KinUX', '~> 2.1.0'
+pod 'KinUX', '~> 2.1.1'
 
 // Add design for direct access to UI views you can use in your own app
-pod 'KinDesign', '~> 2.1.0'
+pod 'KinDesign', '~> 2.1.1'
 ```
 
 ## Sample App

diff --git a/kin-ios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/kin-ios.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>