Bug fixes and performance improvements

texyz · texyz · commit d3e35bc3ddba · 2021-05-24T10:00:05.000+01:00
diff --git a/Example/FlutterwaveSDK.xcodeproj/project.pbxproj b/Example/FlutterwaveSDK.xcodeproj/project.pbxproj
@@ -217,7 +217,7 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = 77G456H6NP;
+						DevelopmentTeam = YL4C3AS383;
 						LastSwiftMigration = 0900;
 					};
 					607FACE41AFB9204008FA782 = {
@@ -510,11 +510,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = FlutterwaveSDK_Example.entitlements;
-				DEVELOPMENT_TEAM = 77G456H6NP;
+				DEVELOPMENT_TEAM = YL4C3AS383;
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.3.1;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -535,7 +535,7 @@
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.8;
+				MARKETING_VERSION = 1.3.1;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Example/FlutterwaveSDK/ViewController.swift b/Example/FlutterwaveSDK/ViewController.swift
@@ -32,25 +32,25 @@ class ViewController: UIViewController, FlutterwavePayProtocol {
     
     
     @objc func showExample(){
-               let config = FlutterwaveConfig.sharedConfig()
-               config.paymentOptionsToExclude = []
-               config.currencyCode = "NGN" // This is the specified currency to charge in.
-               config.email = "[USER'S EMAIL]" // This is the email address of the customer
-               config.isStaging = true // Toggle this for staging and live environment
-               config.phoneNumber = "[USER'S PHONE_NUMBER]" //Phone number
-               config.transcationRef = "[TRANSACTION REF]" // This is a unique reference, unique to the particular transaction being carried out. It is generated when it is not provided by the merchant for every transaction.
-               config.firstName = "[USER'S FIRST NAME]" // This is the customers first name.
-               config.lastName = "[USER'S SECOND NAME]" //This is the customers last name.
-               config.meta = [["metaname":"sdk", "metavalue":"ios"]] //This is used to include additional payment information
-               config.narration = "simplifying payments for endless possibilities"
-               config.publicKey = "[PUB_KEY]" //Public key
-               config.encryptionKey = "[ENCRYPTION_KEY]" //Encryption key
-               config.isPreAuth = false  // This should be set to true for preauthoize card transactions
-               let controller = FlutterwavePayViewController()
-               let nav = UINavigationController(rootViewController: controller)
-               controller.amount = "[AMOUNT]" // This is the amount to be charged.
-               controller.delegate = self
-               self.present(nav, animated: true)
+        let config = FlutterwaveConfig.sharedConfig()
+                     config.paymentOptionsToExclude = []
+                     config.currencyCode = "NGN" // This is the specified currency to charge in.
+                     config.email = "[USER'S EMAIL]" // This is the email address of the customer
+                     config.isStaging = true // Toggle this for staging and live environment
+                     config.phoneNumber = "[USER'S PHONE_NUMBER]" //Phone number
+                     config.transcationRef = "[TRANSACTION REF]" // This is a unique reference, unique to the particular transaction being carried out. It is generated when it is not provided by the merchant for every transaction.
+                     config.firstName = "[USER'S FIRST NAME]" // This is the customers first name.
+                     config.lastName = "[USER'S SECOND NAME]" //This is the customers last name.
+                     config.meta = [["metaname":"sdk", "metavalue":"ios"]] //This is used to include additional payment information
+                     config.narration = "simplifying payments for endless possibilities"
+                     config.publicKey = "[PUB_KEY]" //Public key
+                     config.encryptionKey = "[ENCRYPTION_KEY]" //Encryption key
+                     config.isPreAuth = false  // This should be set to true for preauthoize card transactions
+                     let controller = FlutterwavePayViewController()
+                     let nav = UINavigationController(rootViewController: controller)
+                     controller.amount = "[AMOUNT]" // This is the amount to be charged.
+                     controller.delegate = self
+                     self.present(nav, animated: true)
                
            }
 
diff --git a/FlutterwaveSDK.podspec b/FlutterwaveSDK.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'FlutterwaveSDK'
-    s.version          = '1.2.8'
+    s.version          = '1.3.1'
     s.summary          = 'FlutterwaveSDK'
     
     # This description is used to generate tags and improve search results.
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
     s.screenshots     = 'https://github.com/Flutterwave/FlutterwaveSDK/blob/master/FlutterwaveSDK/Assets/Assets.xcassets/FlutterwaveScreenshot.imageset/FlutterwaveScreenshot.png'
     s.license          = { :type => 'MIT', :file => 'LICENSE' }
     s.author           = { 'Flutterwave Developers' => 'developers@flutterwavego.com' }
-    s.source           = { :git => 'https://github.com/Flutterwave/FlutterwaveSDK.git', :tag => '1.2.8'}
+    s.source           = { :git => 'https://github.com/Flutterwave/FlutterwaveSDK.git', :tag => s.version}
     s.social_media_url = 'https://twitter.com/FlutterwaveEng'
     
     s.ios.deployment_target = '11.0'
diff --git a/FlutterwaveSDK/Classes/UI/FlutterwavePayViewController.swift b/FlutterwaveSDK/Classes/UI/FlutterwavePayViewController.swift
@@ -1028,8 +1028,6 @@ public class FlutterwavePayViewController: BaseViewController {
         
         let phoneValid = self.mobileMoneyUgandaContentContainer.mobileMoneyUgandaPhone.validateAndShowError(validationType: ValidatorType.requiredField(field: "phone number"))
         
-        MobileMoneyViewModel.sharedViewModel.ugandaMoney(amount: self.amount.orEmpty(), phoneNumber: flutterwaveMobileMoneyUganda.phoneNumber.orEmpty())
-        
         if (phoneValid){
             MobileMoneyViewModel.sharedViewModel.ugandaMoney(amount: self.amount.orEmpty(), phoneNumber: flutterwaveMobileMoneyUganda.phoneNumber.orEmpty())
         }
diff --git a/FlutterwaveSDK/Classes/UI/NewExtraFlutterwave/FlutterWave+UIPickerView.swift b/FlutterwaveSDK/Classes/UI/NewExtraFlutterwave/FlutterWave+UIPickerView.swift
@@ -50,11 +50,6 @@ extension FlutterwavePayViewController : UITextFieldDelegate,CardSelect,UIPicker
         }
     }
     
-    //Disable textfield interactions
-    public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool  {
-        self.resignFirstResponder()
-        return false
-    }
     
     
     public func textFieldDidBeginEditing(_ textField: UITextField) {
diff --git a/FlutterwaveSDK/Classes/Utils/RaveConstants.swift b/FlutterwaveSDK/Classes/Utils/RaveConstants.swift
@@ -25,7 +25,7 @@ class RaveConstants: NSObject {
         
     }
     
-    static let flutterWaveVersion = "1.2.8"
+    static let flutterWaveVersion = "1.3.1"
     static let flutterColor = UIColor(hex: "#F5A623")
     
     static let bankStyle = [(code:"044",color:"#143f89",image:"rave_access2"),
diff --git a/FlutterwaveSDK/Classes/ViewModel/MobileMoneyViewModel.swift b/FlutterwaveSDK/Classes/ViewModel/MobileMoneyViewModel.swift
@@ -44,7 +44,7 @@ class MobileMoneyViewModel: BaseViewModel{
         let request = UgandaMobileMoneyRequest(txRef: FlutterwaveConfig.sharedConfig().transcationRef, amount: amount, email: FlutterwaveConfig.sharedConfig().email, phoneNumber: phoneNumber, currency: FlutterwaveConfig.sharedConfig().currencyCode, network: "MTN")
         makeAPICallRx(request: request, apiRequest: mobileMoneyRepository.ugandaMoney(request:), successHandler: ugandaMoneyResponse, onSuccessOperation: {response in
             self.checkAuth(response: response, flwRef: "",source: .ugandaMoney)
-        }, apiName: .zambiaMoney, apiErrorName: .zambiaMoneyError)
+        }, apiName: .ugandaMoney, apiErrorName: .ugandaMoneyError)
     }
     
     func zambiaMoney(amount: String, phoneNumber: String, network: String) {

Original file line number	Diff line number	Diff line change
`@@ -1028,8 +1028,6 @@ public class FlutterwavePayViewController: BaseViewController {`
`1028`	`1028`
`1029`	`1029`	`let phoneValid = self.mobileMoneyUgandaContentContainer.mobileMoneyUgandaPhone.validateAndShowError(validationType: ValidatorType.requiredField(field: "phone number"))`
`1030`	`1030`
`1031`		`- MobileMoneyViewModel.sharedViewModel.ugandaMoney(amount: self.amount.orEmpty(), phoneNumber: flutterwaveMobileMoneyUganda.phoneNumber.orEmpty())`
`1032`		`-`
`1033`	`1031`	`if (phoneValid){`
`1034`	`1032`	`MobileMoneyViewModel.sharedViewModel.ugandaMoney(amount: self.amount.orEmpty(), phoneNumber: flutterwaveMobileMoneyUganda.phoneNumber.orEmpty())`
`1035`	`1033`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,6 @@ extension FlutterwavePayViewController : UITextFieldDelegate,CardSelect,UIPicker`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- //Disable textfield interactions`
`54`		`- public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {`
`55`		`- self.resignFirstResponder()`
`56`		`- return false`
`57`		`- }`
`58`	`53`
`59`	`54`
`60`	`55`	`public func textFieldDidBeginEditing(_ textField: UITextField) {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class RaveConstants: NSObject {`
`25`	`25`
`26`	`26`	`}`
`27`	`27`
`28`		`- static let flutterWaveVersion = "1.2.8"`
	`28`	`+ static let flutterWaveVersion = "1.3.1"`
`29`	`29`	`static let flutterColor = UIColor(hex: "#F5A623")`
`30`	`30`
`31`	`31`	`static let bankStyle = [(code:"044",color:"#143f89",image:"rave_access2"),`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class MobileMoneyViewModel: BaseViewModel{`
`44`	`44`	`let request = UgandaMobileMoneyRequest(txRef: FlutterwaveConfig.sharedConfig().transcationRef, amount: amount, email: FlutterwaveConfig.sharedConfig().email, phoneNumber: phoneNumber, currency: FlutterwaveConfig.sharedConfig().currencyCode, network: "MTN")`
`45`	`45`	`makeAPICallRx(request: request, apiRequest: mobileMoneyRepository.ugandaMoney(request:), successHandler: ugandaMoneyResponse, onSuccessOperation: {response in`
`46`	`46`	`self.checkAuth(response: response, flwRef: "",source: .ugandaMoney)`
`47`		`- }, apiName: .zambiaMoney, apiErrorName: .zambiaMoneyError)`
	`47`	`+ }, apiName: .ugandaMoney, apiErrorName: .ugandaMoneyError)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func zambiaMoney(amount: String, phoneNumber: String, network: String) {`