Release 1.6.0 hotfix (master) (#127)

* Update KarhooPaymentView and make it public (#62)

* Update KarhooPaymentView and make it public

* Add UIView extensions

* Add UIView extensions functions to the existing one

* [MOB-2976] Quote polling fix (#72)

* Merge develop, update pods

* no message

* handle quote polling

* Revert pods to point back to develop.

* no message

* no message

* no message

* MOB-2949 - Driver allocation delay alert (#73)

* Show alert on driver allocation delay

* Show Ride Details and not Rides List screen

* Add tests

* Remove extra . from text

* identifier added (#75)

Co-authored-by: Nurseda Balcioglu <nurseda.balcioglu@karhoo.com>

* CircleCI update (#74)

* Update with userLogin and config auth

* Move userLogin from Keys to ViewController

* Delete userLogin from Keys

* Move config settings setup to ViewController

* Use local userLogin

* Update with additional keys

* Update keys

* Set auth config

* Update keys

* Extract KarhooConfig

* Remove echo of KarhooConfig

* Re-add MockTripAllocationView

* Re-add MockTripAllocationView

* Re-add KarhooAddressSearchBarPresenterSpec

* Re-add CurrencyCodeConverterSpec

* Re-add MockAlertHandler

* Re-add MockQuoteSorter

* Re-add AdyenCardRegistrationFlowSpec

* Re-add MockQuoteSorter

* Re-add MockAddressBarView

* Re-add MockQuoteSorter again

* Re-add MockAddressMapView

* MockQuoteSorter again

* Re-add //

* Re-add MockQuoteSorter

* MockQuoteSorter for a change

* Add MockQuoteSorter

* Change import order

* Changed MockQuoteSorter encoding

* Add in Build Phase

* Move MockQuoteSorter into KarhooQuoteListPresenterSpec

* Move UnitTestSetup

* Revert to old MockQuoteSorter

* Add space

* Update to use env variable instead of echo

* Update fastlane version

* Update bundler

* Update tabbing

* Update bundler

* Use one line command

* Use --decode

* Add team id

* Point to circleci_fix branch

* Revert to point to develop

* CircleCI Fix (#76)

* Point to SDK fix branch

* Point to cart update branch

* Update to develop

* Update to use $(inherited)

* Clean up lanes

* Move test target out of main target

* Rename lane

* Fastlane scan

* Use FASTLANE_LANE_TEST

* Move target back

* Use bundle exec

* Move install step

* Update fastlane and search_path

* Delete output params

* Updated to remove params

* Add scan params

* Delete Client target from tests

* Updated the test target

* Ignore linting

* Add device back

* Move to Fastfile

* Update to search_paths

* Tweak xcov

* Use bundle exec command

* Add output

* Update fastlane

* Update output name

* Use workspace

* Comment out xcov for now

* Rename to skip flaky test

* Update Slack message text

* Mob 3171 remove unused strings (#77)

* Remove unused strings from UI SDK

* Add ErrorKarhoo to showAlert methods

* MOB-3143 - Contact button refactoring (#79)

* Very basic initial stab at using common StackButtons in Trip Screen.

* Cancel ride plugged in

* Changed show/hide button display constraints

* Delete redundant code

* Kind of working but needs tweaking to display properly

* Update dropdown button constraint

* Try spacing

* Fix stack button resizing

* More or less working but needs padding fix

* Remove spacing and change size of drop down button

* Delete unused voice

* Make var private

* Prefill passenger details for token exchange (#78)

* Prefill passenger details for token exchange

* use existing utility method PassengerInfo.shared.currentUserAsPassenger()

* MOB-3144 - Display cancellation fee on Trip and Ride Details screens (#80)

* Display cancellation fee popup

* Initial attempt at getting cancellation fee

* Refactor to put fee alert display logic in one place

* Dismiss overlay

* Put hide overlay in correct place

* Call cancelBookingConfirmed

* Move trip cancellation logic to CancelRideBehaviour

* Remove redundant delegate protocols

* Add to handle successful cancellation

* Use protocol and get test target compiling but tests still need fixing

* Added tests for booking fee retrieval

* Added tests for cancel ride behaviour

* Added tests for presenters handling cancellation success and remove redundant tests

* Delete redundant test

* Code review changes to remove redundant vars

* MOB-3144 - Add decimal formatting to currency display (#81)

* Add decimal formatting to currency display

* Update to point at develop

* Take user to Rides screen when OK is pressed on the cancel screen (#82)

* MOB-3193 - Cancellation SLA (#83)

* Take user to Rides screen when OK is pressed on the cancel screen

* Added free cancellation info

* Added tests for SLA free cancellation minutes

* Fix logic for cancellation info display

* Remove suffix url parameter from adyen (#84)

* Force Adyen 3ds (#85)

* Force 3DS on mobile by setting browserInfo

* Show Adyen error details

* Update podfile

* Add SupplyPartnerId to the AdyenPayments request (#86)

* Add SupplyPartnerId to the AdyenPayments request

* Code review feedback

* MOB-3190 - Align Trip & Ride buttons (#87)

* Updated ride/trip details buttons to align with Android

* Added asserts for click actions

* Mob 3205 update quote model use fleet (#88)

* Use Quote Fleet model

* Update podfile

* Handle 3DS callback in Client app (#89)

* When possible, show cancellable notification in the booking confirmation screens. (#91)

* When possible, show the notification that a ride is cancellable, in the booking confirmation screens.

* Remove duplicate cancelation message formatting.

* Feature/mob 3194 display cancellation sla in the booking request component (#92)

* Prepare cancellation info label for UI testing.

* Show free cancellation info in the ride list and details screens (#93)

* Do not cut off price information in the quote list (#95)

* On small devices

* Use nonce from response for Adyen booking (#96)

* Add free cancellation message when available before driver en route (#94)

* Refactor to use enum cancellation types. (#97)

* Task/mob 3184 add linting to iOS builds (#98)

* Fix all swiftlint violations & warnings.

* Add small swiftlint issue & add swiftlint CircleCI step

* Add swiftlint CircleCI job

* Fix small swiftlint issue

* Add more serious swiftlint issue

* Revert "Add more serious swiftlint issue"

This reverts commit 70eed30.

* Update SwiftLint pod & solve more swiftlint issues

* Include the folder to scan with SwiftLint

* fix and refactoring icon size (#100)

* fix and refactoring icon size

* removed empty lines

* Bump kramdown from 2.3.0 to 2.3.1 (#99)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Feature/mob 3237 show message when no fleet is available at a time (#101)

* Add message when quotes requests are completed with no quotes.

TODO: add unit tests (right now the KarhooQuoteListPresenterSpec are not running.

* Fix some unit tests

* Add padding to the message. Rename function.

* Complete the renaming of the function.

* Fix/mob 2842 coming back to the app after trip completion signs the user out (#103)

* Fix bug which hides the filtering, sorting controls in the quotes list.

* Fix bug which closes the booking view after the app goes into the background.

* Mob 3226 display cancellation time friendly (#102)

* added new TimeFormatter class, plurals localizable files and strings

* added stringsdict to podspec

* modified TimeFormatter and using it in different parts of the app

* added tests for TimeFormatter

* podfile

* shorter return

* [MOB-3181] Fix CircleCI XCov (#104)

* Update

* no message

* CircleCI run xcov

* [MOB-3185] Fix test (#106)

* Seems like this test doesn't fail anymore

* Found the issue

* changed price display rules (#105)

* changed price display rules

* new test and small fix

* [MOB-3216] Release 1.5.0 (#109)

* Bump versions

* no message

* Bump nokogiri from 1.10.10 to 1.11.3 (#107)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.10.10...v1.11.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Make Braintree versions more specific. (#108)

Right now, if trying to update, Braintree drop in will install version 9, which is not supported.

* MOB-3277 [Config & Prep] Navigation: Implementation of a "lite" burge… (#110)

* MOB-3277 [Config & Prep] Navigation: Implementation of a "lite" burger menu for guest checkout mode

* Solved PR comms - remade var weak

* Bump version (#112)

* Fix/mob 3290 fix en and add fr translations for profile booking request views (#118)

* Fix FR and EN wording for guest checkout CTA + sign out texts in FR

* Re-use the book button title from auth user experience.

* Redirect to trip tracking url only when user confirms the action after an alert action (#115)

* Display correct schedule for guest prebooked rides in the booking request view. (#117)

Also for token exchange experiences.

* Sort quotes by price when the user choses to prebook the ride. (#119)

* Reverse geocode only once when double tapping on current location (#120)

* Reverse geocode only once when double tapping on current location

* Make assertions about longitude as well when testing current location reverse geocoding.

* Add metadata dictionary to Booking Request view to be sent to booking api (#121)

* Add metadata dictionary to Booking Request view to be sent to booking api

* Fix tests

* Add tests for the bookingMetadata and make it optional

* Add default implementation for bookingMetadata

* Use var instead of function for bookingMetadata

* Bump nokogiri from 1.11.3 to 1.11.5 (#114)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.11.3...v1.11.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3333 [Config & Prep] Set the default map zoom (#116)

* MOB-3333 [Config & Prep] Set the default map zoom

* Add PR changes, check if the location permission is granted, hide the address setOnMap and currentLocation options if the location is not granted

* Fixed pickup pin icon bug where it was shown when location permissions weren't granted

* Modify cancellation period displayed on the quote for ASAP rides (#122)

* Display the correct message in the rides screen (#123)

* Display the correct message in the rides screen

* make the RideCellViewModel.isPrebook private

* Update podfile to point to develop branch on NSDK

* Making prebook a local variable in TripMetadataViewModel and RideCellViewModel

* Release 1.6.0 (develop) (#124)

* Bump version number, use NSDK 1.5.0

* Update podspec

* remove swiftlint from podspecs

* Hotfix for rides screen navigation to track driver

* Fix for rides screen navigation to track driver

Co-authored-by: EdwardW2 <44901854+EdwardW2@users.noreply.github.com>
Co-authored-by: Jo Santa Maria <60882714+jsm20@users.noreply.github.com>
Co-authored-by: nurito-burrito <44758040+nurito-burrito@users.noreply.github.com>
Co-authored-by: Nurseda Balcioglu <nurseda.balcioglu@karhoo.com>
Co-authored-by: cornelkar <61707821+cornelkar@users.noreply.github.com>
Co-authored-by: cosminBadulescu <cosmin.badulescu@soft-to-you.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mateid-kr <79910867+mateid-kr@users.noreply.github.com>

KarhooUISDK/Screens/Rides/RidesList/RideCell/RideCell.swift

@@ -170,11 +170,11 @@ private extension RideCell {
         view.layer.borderWidth = 1
         view.layer.borderColor = UIColor.lightGray.cgColor
 
-        contentView.addSubview(view)
-        _ = [view.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 20.0),
-             view.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -20.0),
-             view.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 20.0),
-             view.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -20.0)].map { $0.isActive = true }
+        addSubview(view)
+        _ = [view.topAnchor.constraint(equalTo: topAnchor, constant: 20.0),
+             view.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -20.0),
+             view.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 20.0),
+             view.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -20.0)].map { $0.isActive = true }
 
         return view
     }

Podfile.lock

@@ -46,7 +46,7 @@ PODS:
   - KarhooSDK (1.5.0):
     - KeychainSwift (= 12.0.0)
     - ReachabilitySwift (= 5.0.0)
-  - KarhooUISDK (1.5.1):
+  - KarhooUISDK (1.6.0):
     - Adyen (= 3.6.0)
     - Braintree/PaymentFlow (~> 4.37)
     - BraintreeDropIn (~> 8.1)
@@ -97,7 +97,7 @@ SPEC CHECKSUMS:
   BraintreeDropIn: 073ef11637285efc5572b412079a34942c849ef9
   FloatingPanel: 579a5ac0154f923a9d7302c4f13dbc0268511c92
   KarhooSDK: da935abbbd4e6742ec7dabb97364fbb2ffc5ffaf
-  KarhooUISDK: cd8f08876687db7438029e231e63f679909e3d33
+  KarhooUISDK: 7da2263e0acb082e2da2013b5ca521cf74ded8f1
   KeychainSwift: d5e776578587ee5958ce36601df22f168f65138a
   PhoneNumberKit: ff153d5e299f6da566cb73c6aa71e354933b2932
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825