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.

Sign up for GitHub

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

Jump to bottom

[iOS] - Fix Leo QA - 2 #22578

Merged
merged 3 commits into from
Mar 14, 2024
Merged

[iOS] - Fix Leo QA - 2 #22578

merged 3 commits into from
Mar 14, 2024

Conversation

Brandon-T
Copy link
Contributor

@Brandon-T Brandon-T commented Mar 13, 2024 •
edited by kjozwiak
Loading

  • Fix Leo buttons only being tappable on their labels instead of the entire button.
  • Fix "Upgrade Now" buttons being only tappable on its label and not the entire button (same fix as above).
  • Fix screen dismissing Paywall screen being presented and dismissed from Settings.
  • Reduce Subscription Restoration timeout to 30s.

Resolves brave/brave-browser#36787
Resolves brave/brave-browser#36788
Resolves brave/brave-browser#36780

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@Brandon-T
Fix buttons not being tappable throughout the app.
63b8878 
Fix screen dismissing due to alerts and sheets being added on non-unary views
@Brandon-T Brandon-T added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 labels Mar 13, 2024
@Brandon-T Brandon-T added this to the 1.65.x - Nightly milestone Mar 13, 2024
@Brandon-T Brandon-T self-assigned this Mar 13, 2024
@Brandon-T Brandon-T requested a review from a team as a code owner March 13, 2024 19:43
kylehickinson
kylehickinson approved these changes Mar 13, 2024
View reviewed changes
ios/brave-ios/Sources/AIChat/Components/Settings/AIChatAdvancedSettingsView.swift Outdated
Image(braveSystemName: "leo.launch")
.foregroundStyle(Color(braveSystemName: .iconDefault))
.frame(alignment: .trailing)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: redundant/no effect

kylehickinson
kylehickinson requested changes Mar 13, 2024
View reviewed changes
ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackView.swift Outdated
Comment on lines 340 to 341
@State
var premiumStatus: AiChat.PremiumStatus
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need @State, you don't set it anywhere

ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackView.swift Outdated
Comment on lines 343 to 344
@Binding
var shouldShowPremiumAd: Bool
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need @Binding, you don't set it anywhere

@Brandon-T Brandon-T merged commit 38a288d into master Mar 14, 2024
19 checks passed
@Brandon-T Brandon-T deleted the bugfix/iOS-Leo-QA-2 branch March 14, 2024 19:38
This was referenced Mar 14, 2024
Merged
Merged
This was referenced Mar 15, 2024
Closed
Closed
Brandon-T added a commit that referenced this pull request Mar 15, 2024
@Brandon-T
[iOS] - Fix Leo QA - 2 (#22578)
73d63d1 
* Fix buttons not being tappable throughout the app.
* Fix screen dismissing due to alerts and sheets being added on non-unary views
* Update feedback logic to use the new backend changes
* Addressed feedback. Reduced purchase restore timeout
@Brandon-T Brandon-T mentioned this pull request Mar 15, 2024
Merged
24 tasks
kjozwiak pushed a commit that referenced this pull request Mar 15, 2024
@Brandon-T
[iOS] - Uplift-1.65.x - Leo QA Iteration 2 (#22618)
50bb6cf 
[iOS] - Fix Leo QA - 2 (#22578)

* Fix buttons not being tappable throughout the app.
* Fix screen dismissing due to alerts and sheets being added on non-unary views
* Update feedback logic to use the new backend changes
* Addressed feedback. Reduced purchase restore timeout
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kylehickinson kylehickinson kylehickinson approved these changes

Assignees

@Brandon-T Brandon-T

Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Milestone
1.66.x - Release
2 participants
@Brandon-T @kylehickinson