[iOS] - Add Free Trial to Leo on iOS #26001
Merged
+95
−24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Brandon-T
added
CI/skip-android
Brandon-T
force-pushed
the
feature/FreeTrial-Leo
branch
from
91551ce
to
47e0985
Compare
Comment on lines
215
to
227
| if (selectedTierType == .monthly && isMonthlyIntroOfferAvailable) | ||
| || (selectedTierType == .yearly && isYearlyIntroOfferAvailable) | ||
| { | ||
| Text(Strings.AIChat.paywallPurchaseActionIntroOfferTitle) | ||
| .font(.body.weight(.semibold)) | ||
| .foregroundColor(Color(.white)) | ||
| .padding() | ||
| } else { | ||
| Text(Strings.AIChat.paywallPurchaseActionTitle) | ||
| .font(.body.weight(.semibold)) | ||
| .foregroundColor(Color(.white)) | ||
| .padding() | ||
| } |
There was a problem hiding this comment.
No need to create a conditional view here, just swap text instead:
let isIntroOfferAvailable =
(selectedTierType == .monthly && isMonthlyIntroOfferAvailable) ||
(selectedTierType == .yearly && isYearlyIntroOfferAvailable)
Text(isIntroOfferAvailable ?
Strings.AIChat.paywallPurchaseActionIntroOfferTitle) :
Strings.AIChat.paywallPurchaseActionTitle)
.font(.body.weight(.semibold))
.foregroundColor(Color(.white))
.padding()| /// Retrieves a product's renewable subscription trial status | ||
| /// - Parameter product: The product whose subscription trial status to retrieve | ||
| /// - Returns: The renewable subscription's trial status | ||
| @MainActor |
There was a problem hiding this comment.
Why are all these function @MainActor isolated? None of it seems to require it
There was a problem hiding this comment.
Ahh you're right. I got used to applying MainActor to everything because of BraveSkusSDK using Brave-Core functions. But in reality only the BraveSkusSDK needs it. So I removed it from all the AppStoreSDK functions :)
| @@ -357,7 +357,7 @@ extension Strings { | |||
| "aichat.paywallYearlySubscriptionDescription", | |||
| tableName: "BraveLeo", | |||
| bundle: .module, | |||
| value: "SAVE UP TO 25%", | |||
| value: "BEST VALUE", | |||
| comment: | |||
| "The description indicating yearly subscription that show how much user is saving percentage" | |||
There was a problem hiding this comment.
Comment needs an update
kylehickinson
approved these changes
Oct 16, 2024
|
Released in v1.73.22 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves brave/brave-browser#37961
Submitter Checklist:
QA/YesorQA/No;release-notes/includeorrelease-notes/exclude;OS/...) to the associated issuenpm run test -- brave_browser_tests,npm run test -- brave_unit_testswikinpm run presubmitwiki,npm run gn_check,npm run tslintgit rebase master(if needed)Reviewer Checklist:
gnAfter-merge Checklist:
changes has landed on
Test Plan:
trim.1777EEA5-7847-479C-B7AE-41645FB953A6.MOV