Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main into Release 5.6.0 #1762

Merged
merged 5 commits into from Dec 6, 2022
Merged

Main into Release 5.6.0 #1762

merged 5 commits into from Dec 6, 2022

Conversation

scottkicks
Copy link
Contributor

Merging main into release-5.6.0

msadoon and others added 5 commits November 22, 2022 12:04
* added a project currency, oddly build is crashing when opening a project, but unrelated to any new code.

* removed extaneous currency field from top level project and used existing stats field.

* fixed incorrect parameter build issue

* fixed extra parameter in lenses

* removed unused line

* corrected display issues for rewards and reward addons.

* reverting spacing in ProjectLenses, unneeded change, cluttering pr

* more ProjectLenses updated

* bonus support currency fix on pledge page.

* updated a shared function of min max pledge amount to use the project's currency country instead of project country.

* updated Apple Pay request currency code to be from project currency first, then project country currency. Also updated the supported networks of apple pay to be based on project currency country instead of project country

* updated analytics to come from the project currency country not project country

* updated summary view, apple pay alert, and expandable rewards header (spacing) to use project currency country first then project country

* total values for pledge summary view using project currency country before project country

* handled logged currency display scenarios (manage pledge flow)

* formatting

* fixed currency issue when user logged in and about to manage pledge, fetch backing doesn't update the chosen currency in the project.

* added view model tests

* more view model tests

* project summary view model tests

* pledge view model and project page view model tests

* project page snapshot tests added, existing project lense hadn't accounted for extended project properties, now it does.

* pr comments.
* adds  bool to user model

* separate apple and facebook signals to gain more control over facebook flow in LoginToutViewController

* Push SetYourPasswordViewController if fb user needs a password

* Run make strings script to pull in latest string updates from server

* fetch user's email and set context label

* create new password on user account and handle success and error cases

* make strings

* change nav bar back button text

* update unit tests

* wrap in fb login depreciated feature flag

* update view model tests

* adds activity indicator

* update strings

* add tests

* format

* update failing snapshot tests

* needsPassword is not actually an optional

* use kickstarter conventions

* updates uses of now non nil needsPassword property

* move loading indicator from top level view to stackview and replace save button when loading indicator is showing

* update snapshot tests

* update comments

* update snapshot tests

* update saveButton isHidden/isEnabled

* Remove unused User+GraphUser.swift

* Update User+UserFragment.swift

* Removes User+UserGraph releated tests

* Update LoginToutViewModelTests

* Update SetYourPasswordViewModelTests

* formatting

* Refactor needsPassword static func

* put back User+GraphUser because more test files than expected use it

* Revert "Removes User+UserGraph releated tests"

This reverts commit 2026508.

* corrected the api and library tests, was able to remove unused User+GraphUser and tests. Snapshot tests still failing.

* updated snapshot tests, all kickstarter-ios tests recorded and passing on intel. Should pass CI checks.

* revoked a change just being used for testing.

* rerecorded tests due to translation changes

* more re-records on Intel because of translations

* updated set your view model tests

Co-authored-by: Mubarak Sadoon <msadoon@gmail.com>
…#1758)

* needs password needs to be optional.

* add a default property for encoding
* added constraints to add new button and loading indicator view to constraint them to the edges of their stack view and center them. One is only shown at a time, so the spacing error should not occur anymore.

* slight adjustment in the add button and loading indicator positions.

* updates to pledge view controller screenshot tests.
@scottkicks scottkicks added this to the release-5.6.0 milestone Dec 6, 2022
@scottkicks scottkicks self-assigned this Dec 6, 2022
@codecov
Copy link

codecov bot commented Dec 6, 2022

Codecov Report

Merging #1762 (b936c69) into release-5.6.0 (d3eb050) will increase coverage by 0.04%.
The diff coverage is 90.92%.

@@                Coverage Diff                @@
##           release-5.6.0    #1762      +/-   ##
=================================================
+ Coverage          85.38%   85.42%   +0.04%     
=================================================
  Files               1275     1273       -2     
  Lines             115189   116209    +1020     
  Branches           30457    30637     +180     
=================================================
+ Hits               98352    99273     +921     
- Misses             15783    15869      +86     
- Partials            1054     1067      +13     
Impacted Files Coverage Δ
...e/Controller/CancelPledgeViewControllerTests.swift 100.00% <ø> (ø)
Library/ViewModels/RootViewModel.swift 0.00% <0.00%> (ø)
KsApi/models/lenses/UserLenses.swift 5.26% <5.88%> (+0.02%) ⬆️
...LoginTout/Controller/LoginToutViewController.swift 56.16% <9.09%> (-2.51%) ⬇️
KsApi/models/lenses/ProjectLenses.swift 17.42% <19.67%> (+0.38%) ⬆️
KsApi/models/User.swift 81.96% <50.00%> (-0.54%) ⬇️
Library/ApplePayCapabilities.swift 81.63% <50.00%> (-1.71%) ⬇️
Library/PKPaymentRequest+Helpers.swift 98.36% <50.00%> (-1.64%) ⬇️
Library/ViewModels/ManagePledgeViewModel.swift 95.42% <50.00%> (-0.31%) ⬇️
...rary/ViewModels/PledgeAmountSummaryViewModel.swift 88.05% <50.00%> (+0.18%) ⬆️
... and 58 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@scottkicks scottkicks merged commit fdaf39e into release-5.6.0 Dec 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants