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

Refresh receipt for VPN + Public Receipt Viewer #26560

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Refresh receipt for VPN + Public Receipt Viewer #26560

merged 3 commits into from
Nov 14, 2024

Conversation

Brandon-T
Copy link
Contributor

@Brandon-T Brandon-T commented Nov 14, 2024 •
edited
Loading

Resolves brave/brave-browser#42302

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:

IMG_9086
IMG_9087
IMG_9088

@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 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Nov 14, 2024
@Brandon-T Brandon-T self-assigned this Nov 14, 2024
@Brandon-T Brandon-T requested a review from a team as a code owner November 14, 2024 20:40
nuo-xu
nuo-xu reviewed Nov 14, 2024
View reviewed changes
ios/brave-ios/Sources/BraveStore/Views/StoreKitReceiptSimpleView.swift Outdated
Comment on lines 103 to 107
.navigationTitle(Strings.ReceiptViewer.receiptViewerTitle)
.navigationViewStyle(.stack)
.introspectNavigationController { controller in
controller.navigationBar.topItem?.backButtonDisplayMode = .minimal
}
Copy link
Contributor

Choose a reason for hiding this comment

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

feel like these can be take out as a common code for the three conditions

nuo-xu
nuo-xu reviewed Nov 14, 2024
View reviewed changes
ios/brave-ios/Sources/BraveStore/Views/StoreKitReceiptSimpleView.swift Outdated
Comment on lines 108 to 118
.toolbar {
if let base64EncodedReceipt {
ToolbarItem(placement: .navigationBarTrailing) {
ShareLink(item: base64EncodedReceipt) {
Label(Strings.ReceiptViewer.shareReceiptTitle, systemImage: "square.and.arrow.up")
}
.padding()
}
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

this toolbar as well

@Brandon-T Brandon-T requested a review from nuo-xu November 14, 2024 21:03
@Brandon-T Brandon-T merged commit 9cdd2c1 into master Nov 14, 2024
17 checks passed
@Brandon-T Brandon-T deleted the bugfix/VPNReceiptSync branch November 14, 2024 22:42
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 14, 2024
brave-builds added a commit that referenced this pull request Nov 14, 2024
@brave-builds
Uplift of #26560 (squashed) to beta
5759a55
brave-builds added a commit that referenced this pull request Nov 14, 2024
@brave-builds
Uplift of #26560 (squashed) to release
6e51d5a
This was referenced Nov 14, 2024
Merged
Merged
@brave-builds
Copy link
Collaborator

Released in v1.75.21

@hffvld
Copy link
Collaborator

hffvld commented Nov 16, 2024

Verified on iPhone 14 using version(s):

Device/OS: iPhone 14 / iOS 17.7.1
Brave build: 1.75 (23)
BraveCore: 1.75.23 (131.0.6778.69)

STEPS:

  1. Launch Brave
  2. Purchase VPN subscription
  3. Hamburger menu > Settings
  4. Brave Firewall + VPN > Link purchase to your Brave account
  5. Attempt to link subscription > Verify

ACTUAL RESULTS:

  • Verified that VPN subscription can be linked to account.brave.com.
  • Verified that the receipt is not empty.
1 2 3
1 2 3
1 2 3
2024-11-15_16-37-58.mp4

kjozwiak pushed a commit that referenced this pull request Nov 16, 2024
@brave-builds
Refresh receipt for VPN + Public Receipt Viewer (uplift to 1.74.x) (#…
f03c11f 
…26566)

Uplift of #26560 (squashed) to beta
kjozwiak pushed a commit that referenced this pull request Nov 16, 2024
@brave-builds
Refresh receipt for VPN + Public Receipt Viewer (uplift to 1.73.x) (#…
99ea028 
…26567)

Uplift of #26560 (squashed) to release
@hffvld hffvld mentioned this pull request Nov 19, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nuo-xu nuo-xu nuo-xu approved these changes

Assignees

@Brandon-T Brandon-T

Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-teamcity Do not run builds in TeamCity 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.75.x - Beta
Development

Successfully merging this pull request may close these issues.

[iOS] - VPN Receipt Not Found when Linking
4 participants
@Brandon-T @brave-builds @hffvld @nuo-xu