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

Implements Welcome Links Navigation in Subscriptions #2371

Merged
merged 32 commits into from
Jan 24, 2024
Merged

Implements Welcome Links Navigation in Subscriptions #2371

merged 32 commits into from
Jan 24, 2024

Conversation

afterxleep
Copy link
Collaborator

@afterxleep afterxleep commented Jan 24, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/1200019156869587/1205017548855433/f

Description:

  • Implements onAppear navigation for Settings, so you can navigate to a view programmatically when the view is shown
  • Implements navigation from the Subscription Welcome page to each feature

Steps to test this PR:

⚠️ Use a device + sandbox account

  1. Subscribe or restore a subscription
  2. From the welcome page, tap any of the feature buttons
  3. Observe you are taken back to Settings and then to the selected feature. (or placeholder for it)
  4. It should be enought to test one of the three buttons (VPN/ITP/DBP), but feel free to remove/restore the subscription and test all all them if you want.
  5. Remove the subscription from the device and observe an ActionMessage (little "toast" message at the bottom) appears confirming it was removed
Internal references:

Software Engineering Expectations
Technical Design Template

@afterxleep
SubscriptionRestore View
40aabe9
@afterxleep
Restore subscription via Apple ID
343fbdc
@afterxleep
Typo
8f5f549
@afterxleep
NOOP
b1dd001
@afterxleep
Typo
3c5b8bb
@afterxleep
Merge branch 'main' into daniel/subscriptions/4.restore-options
20d2b65
@afterxleep
Subscription API Updates (From macOS)
d3e54f1
@afterxleep
Add Email to subscription and organize Strings
d61d7ba
@afterxleep
Activate via Email
5177005
@afterxleep
Dismiss view after email activation
319c96c
@afterxleep
Another dismissal approach
4fa9429
@afterxleep
Correct navigation after activating subscription
8b96fb8
@afterxleep
Restore subscription from email
1deb26c
@afterxleep
Restore view for existing email
e58f9e5
@afterxleep
Manage subscription email
43f3b8e
@afterxleep
Email Management flows
52d70fc
@afterxleep
Lint issues and comments
e3a4dd4
@afterxleep
Add device from welcome screen
144b832
@afterxleep
OnAppear navigation
1404dd3
@afterxleep
Settings onAppear Navigation
4b0f086
@afterxleep
Navigate back to Settings and open an existing subscription feature
12eb88e
@afterxleep
Removed whitespace
9907bb9
@afterxleep
Merge branch 'main' into daniel/subscriptions/5.email-restore
b5bee18 
# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
@afterxleep
Merge branch 'daniel/subscriptions/5.email-restore' into daniel/subsc…
6e229a6 
…riptions/6.welcome-links
@afterxleep afterxleep changed the title Implements Welcome Links Implements Welcome Links Navigation in Subscriptions Jan 24, 2024
@afterxleep afterxleep marked this pull request as ready for review January 24, 2024 00:48
@afterxleep afterxleep requested a review from miasma13 January 24, 2024 01:21
@afterxleep
Comment
2704c3c
@afterxleep
Merge branch 'main' into daniel/subscriptions/6.welcome-links
02da0d7 
# Conflicts:
#	DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift
#	DuckDuckGo/Subscription/ViewModel/SubscriptionRestoreViewModel.swift
#	DuckDuckGo/Subscription/Views/SubscriptionFlowView.swift
@afterxleep
Subscription removal confirmation Toast
9a34d70
@afterxleep
Remove unwanted class
1c81e93
@afterxleep
Cleanup
6dad555
@afterxleep afterxleep merged commit 4a3c10e into main Jan 24, 2024
10 checks passed
@afterxleep afterxleep deleted the daniel/subscriptions/6.welcome-links branch January 24, 2024 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miasma13 miasma13 miasma13 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@afterxleep @miasma13