Tag/1.0.0 beta06 (#239)

* Security fixes
* Bug fixes
* UI and usability enhancements

Author: Peter Joseph Olamit

.gitignore

@@ -63,3 +63,13 @@ Carthage/
 # Fastlane
 fastlane/README.md
 fastlane/report.xml
+/.idea/.name
+/.idea/runConfigurations/Demo.xml
+/.idea/hyperwallet-ios-ui-sdk.iml
+/.idea/runConfigurations/HyperwalletUISDK.xml
+/.idea/modules.xml
+/.idea/vcs.xml
+/.idea/workspace.xml
+/.idea/xcode.xml
+/.idea/shelf/local-config/shelved.patch
+/.idea/shelf/local-config.xml

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+[1.0.0-beta06](https://github.com/hyperwallet/hyperwallet-ios-ui-sdk/releases/tag/1.0.0-beta06)
+-------------------
+- Security fixes
+- Bug fixes
+- UI and usability enhancements
+
 [1.0.0-beta05](https://github.com/hyperwallet/hyperwallet-ios-ui-sdk/releases/tag/1.0.0-beta05)
 -------------------
 - Added Analytics to Transfer Method Module

Cartfile

@@ -1,2 +1,2 @@
-github "hyperwallet/hyperwallet-ios-sdk" "1.0.0-beta06"
-github "hyperwallet/hyperwallet-ios-insight" "1.0.0-beta02"
+github "hyperwallet/hyperwallet-ios-sdk" "1.0.0-beta07"
+github "hyperwallet/hyperwallet-ios-insight" "1.0.0-beta03"

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "JanGorman/Hippolyte" "0.8.0"
 github "httpswift/swifter" "1.4.7"
-github "hyperwallet/hyperwallet-ios-insight" "1.0.0-beta02"
-github "hyperwallet/hyperwallet-ios-sdk" "1.0.0-beta06"
+github "hyperwallet/hyperwallet-ios-insight" "1.0.0-beta03"
+github "hyperwallet/hyperwallet-ios-sdk" "1.0.0-beta07"

Common/Sources/Extensions/HyperwalletFee.swift

@@ -65,9 +65,8 @@ public extension HyperwalletFee {
         private func flatFeeDescription(_ flatFee: HyperwalletFee) -> String {
             var description = ""
             let feeFormat = "fee_flat_formatter".localized()
-
-            if let currency = flatFee.currency, let flatValue = flatFee.value {
-                description = String(format: feeFormat.localized(), currency, flatValue)
+            if let currencySymbol = currencySymbol(currency: flatFee.currency), let flatValue = flatFee.value {
+                description = String(format: feeFormat.localized(), currencySymbol, flatValue)
             }
             return description
         }
@@ -80,15 +79,18 @@ public extension HyperwalletFee {
             let max = percentFee.maximum
             let currency = percentFee.currency
 
-            if let min = min, let max = max, let value = value, let currency = currency {
+            if let min = min, let max = max, let value = value,
+                let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_percent_formatter".localized()
-                description = String(format: feeFormat, value, currency, min, max)
-            } else if let min = min, max == nil, let value = value, let currency = currency {
+                description = String(format: feeFormat, value, currencySymbol, min, max)
+            } else if let min = min, max == nil, let value = value,
+                let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_percent_only_min_formatter".localized()
-                description = String(format: feeFormat, value, currency, min)
-            } else if min == nil, let max = max, let value = value, let currency = currency {
+                description = String(format: feeFormat, value, currencySymbol, min)
+            } else if min == nil, let max = max, let value = value,
+                let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_percent_only_max_formatter".localized()
-                description = String(format: feeFormat, value, currency, max)
+                description = String(format: feeFormat, value, currencySymbol, max)
             } else {
                 if let value = value {
                     feeFormat = "fee_percent_no_min_and_max_formatter".localized()
@@ -108,28 +110,37 @@ public extension HyperwalletFee {
             let currency = flatFee.currency
 
             if let min = min, let max = max, let flatValue = flatValue,
-                let percentValue = percentValue, let currency = currency {
+                let percentValue = percentValue, let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_mix_formatter".localized()
                 description = String(
-                    format: feeFormat, currency, flatValue, percentValue, min, max)
+                    format: feeFormat, currencySymbol, flatValue, percentValue, min, max)
             } else if let min = min, max == nil, let flatValue = flatValue,
-                let percentValue = percentValue, let currency = currency {
+                let percentValue = percentValue, let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_mix_only_min_formatter".localized()
                 description = String(
-                    format: feeFormat, currency, flatValue, percentValue, min)
+                    format: feeFormat, currencySymbol, flatValue, percentValue, min)
             } else if min == nil, let max = max, let flatValue = flatValue,
-                let percentValue = percentValue, let currency = currency {
+                let percentValue = percentValue, let currencySymbol = currencySymbol(currency: currency) {
                 feeFormat = "fee_mix_only_max_formatter".localized()
                 description = String(
-                    format: feeFormat, currency, flatValue, percentValue, max)
+                    format: feeFormat, currencySymbol, flatValue, percentValue, max)
             } else {
-                if let flatValue = flatValue, let percentValue = percentValue, let currency = currency {
+                if let flatValue = flatValue, let percentValue = percentValue,
+                    let currencySymbol = currencySymbol(currency: currency) {
                     feeFormat = "fee_mix_no_min_and_max_formatter".localized()
                     description = String(
-                        format: feeFormat, currency, flatValue, percentValue)
+                        format: feeFormat, currencySymbol, flatValue, percentValue)
                 }
             }
             return description
         }
+
+        private func currencySymbol(currency: String?) -> String? {
+            if let currency = currency {
+                let locale = NSLocale(localeIdentifier: currency)
+                return locale.displayName(forKey: .currencySymbol, value: currency)
+            }
+            return nil
+        }
     }
 }

Common/Sources/Extensions/HyperwalletTransferMethod.swift

@@ -33,16 +33,18 @@ extension HyperwalletTransferMethod: GenericCellConfiguration {
         switch type {
         case "BANK_CARD", "PREPAID_CARD":
             return String(format: "%@%@",
-                          "transfer_method_list_item_description".localized(),
+                          "endingIn".localized(),
                           getField(TransferMethodField.cardNumber.rawValue)?
                             .suffix(startAt: 4) ?? "" )
 
         case "PAYPAL_ACCOUNT":
-            return getField(TransferMethodField.email.rawValue)
+            return String(format: "%@%@",
+                          "to".localized(),
+                          getField(TransferMethodField.email.rawValue) ?? "")
 
         default:
             return String(format: "%@%@",
-                          "transfer_method_list_item_description".localized(),
+                          "endingIn".localized(),
                           getField(TransferMethodField.bankAccountId.rawValue)?
                             .suffix(startAt: 4) ?? "")
         }

Common/Sources/Extensions/HyperwalletTransferMethodType.swift

@@ -31,26 +31,15 @@ public extension HyperwalletTransferMethodType {
         let attributedText = NSMutableAttributedString()
         // Fees
         if let fees = self.fees?.nodes {
-            let feeLabel = "add_transfer_method_fee_label".localized()
-
-            attributedText.append(value: feeLabel, font: font, color: color)
-            attributedText.append(value: HyperwalletFee.format(fees: fees),
-                                  font: font,
-                                  color: color)
+            attributedText.append(value: HyperwalletFee.format(fees: fees), font: font, color: color)
         }
 
         // Processing Time
         if let processingTimeValue = self.processingTimes?.nodes?.first?.value, !processingTimeValue.isEmpty {
-            var processingTimeLabel = ""
-
             if attributedText.length > 0 {
-                processingTimeLabel = "\n"
+                let bulletSymbol = " \u{2022} "
+                attributedText.append(value: bulletSymbol, font: font, color: color)
             }
-            processingTimeLabel = String(format: "%@%@",
-                                         processingTimeLabel,
-                                         "add_transfer_method_processing_time_label".localized())
-
-            attributedText.append(value: processingTimeLabel, font: font, color: color)
             attributedText.append(value: processingTimeValue, font: font, color: color)
         }
 

Common/Sources/Extensions/UIAlertAction.swift

@@ -21,13 +21,13 @@ import UIKit
 /// The UIAlertAction extension
 public extension UIAlertAction {
     /// The default cancel button label
-    static let cancel = "cancel_button_label".localized()
+    static let cancel = "cancelButtonLabel".localized()
     /// The default retry button label
     static let retry = "try_again_button_label".localized()
     /// The default close button label
-    static let close = "ok_button_label".localized()
+    static let close = "doneButtonLabel".localized()
     /// The default remove button label
-    static let remove = "remove_button_label".localized()
+    static let remove = "remove".localized()
 
     /// Initialize a cancel alert action
     ///

Common/Sources/Extensions/UIImage.swift

@@ -27,7 +27,6 @@ public extension UIImage {
     ///   - iconSize: The image size
     ///   - fontSize: The font size of the icon
     ///   - textColor: The text color (optional).
-    ///   - backgroundColor: The background color (optional).
     /// - returns: A string that will appear as icon
     static func fontIcon(_ name: String,
                          _ iconSize: CGSize,
@@ -37,7 +36,7 @@ public extension UIImage {
         paragraph.alignment = NSTextAlignment.center
         let fontSize = fontSize
         let attributedString = NSAttributedString(string: name, attributes: [
-            NSAttributedString.Key.font: UIFont(name: "icomoon", size: fontSize)!,
+            NSAttributedString.Key.font: UIFont(name: "hw_mobile_ui_sdk_icons", size: fontSize)!,
             NSAttributedString.Key.foregroundColor: textColor,
             NSAttributedString.Key.paragraphStyle: paragraph
         ])
@@ -52,13 +51,25 @@ public extension UIImage {
         return image!
     }
 
+    /// Create Background Pattern
+    ///
+    /// - Parameters:
+    ///   - color: UIColor
+    ///   - size: CGSize
+    ///   - cornerRadius: Int
+    /// - Returns: UIImage
+    static func createBackgroundPattern(color: UIColor, size: CGSize, cornerRadius: Int) -> UIImage {
+        let image = imageWithColor(color: color, size: size)
+        return roundedImage(image: image, cornerRadius: cornerRadius)
+    }
+
     /// Get an image with specified colors
     ///
     /// - Parameters:
     ///   - color: color of the image
     ///   - size: size for the image
     /// - Returns: image
-    static func imageWithColor(color: UIColor, size: CGSize) -> UIImage {
+    private static func imageWithColor(color: UIColor, size: CGSize) -> UIImage {
         let rect = CGRect(x: 0, y: 0, width: size.width, height: size.height)
         UIGraphicsBeginImageContextWithOptions(size, false, 0)
         color.setFill()
@@ -77,7 +88,7 @@ public extension UIImage {
     ///   - image: image to be formatted
     ///   - cornerRadius: cornerRadius
     /// - Returns: image with rounded corners
-    static func roundedImage(image: UIImage, cornerRadius: Int) -> UIImage {
+    private static func roundedImage(image: UIImage, cornerRadius: Int) -> UIImage {
         let rect = CGRect(origin: CGPoint(x: 0, y: 0), size: image.size)
         UIGraphicsBeginImageContextWithOptions(image.size, false, 1)
         UIBezierPath(
@@ -87,16 +98,4 @@ public extension UIImage {
         image.draw(in: rect)
         return UIGraphicsGetImageFromCurrentImageContext()!
     }
-
-    /// Create Background Pattern
-    ///
-    /// - Parameters:
-    ///   - color: UIColor
-    ///   - size: CGSize
-    ///   - cornerRadius: Int
-    /// - Returns: UIImage
-    static func createBackgroundPattern(color: UIColor, size: CGSize, cornerRadius: Int) -> UIImage {
-        let image = imageWithColor(color: color, size: size)
-        return roundedImage(image: image, cornerRadius: cornerRadius)
-    }
 }

Common/Sources/Extensions/UIToolbar.swift

@@ -32,7 +32,7 @@ public extension UIToolbar {
         toolbar.tintColor = Theme.themeColor
         toolbar.sizeToFit()
 
-        let doneButton = UIBarButtonItem(title: "done_button_label".localized(),
+        let doneButton = UIBarButtonItem(title: "doneButtonLabel".localized(),
                                          style: .plain,
                                          target: target,
                                          action: action)