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

feat: rework cab for onboarding flow #5611

Merged
merged 62 commits into from
Jul 12, 2024
Merged

feat: rework cab for onboarding flow #5611

merged 62 commits into from
Jul 12, 2024

Conversation

MuckT
Copy link
Collaborator

@MuckT MuckT commented Jul 4, 2024

Description

Works to adjust the cab flow for similar styles to onboarding.

Brief Summary of Changes:

  • Styled bottom buttons to match other onboarding buttons - previously they displayed lower than other onboarding buttons and buttons throughout the app.
  • Replaced usages of nav option headers with customer headers to match onboarding headers and allow onboarding step display.
  • Placed Icons on Keyless backup a set distance from the top as to avoid icon content jumps during the flow.
  • Replaced top-level viewsView with ScrollView throughout the KeylessBackupProgress.tsx.

Test plan

  • Tested locally on iOS
  • Tested locally on Android
  • Unit tests updated

Related issues

Backwards compatibility

Yes

Network scalability

N/A

MuckT and others added 27 commits June 28, 2024 13:43
# Conflicts:
#	src/keylessBackup/SignInWithEmail.test.tsx
#	src/keylessBackup/SignInWithEmail.tsx
Copy link

codecov bot commented Jul 4, 2024

Codecov Report

Attention: Patch coverage is 97.26027% with 2 lines in your changes missing coverage. Please review.

Project coverage is 86.71%. Comparing base (ae8c4f0) to head (221cdcc).
Report is 4 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #5611      +/-   ##
==========================================
- Coverage   86.72%   86.71%   -0.01%     
==========================================
  Files         774      772       -2     
  Lines       31621    31591      -30     
  Branches     5471     5474       +3     
==========================================
- Hits        27422    27394      -28     
- Misses       3970     4151     +181     
+ Partials      229       46     -183     
Files Coverage Δ
src/analytics/Events.tsx 100.00% <100.00%> (ø)
src/analytics/Properties.tsx 100.00% <ø> (ø)
src/components/header/CustomHeader.tsx 100.00% <100.00%> (ø)
src/keylessBackup/KeylessBackupPhoneCodeInput.tsx 100.00% <100.00%> (ø)
src/keylessBackup/KeylessBackupProgress.tsx 99.36% <100.00%> (+0.06%) ⬆️
src/keylessBackup/SignInWithEmail.tsx 98.92% <100.00%> (ø)
src/keylessBackup/KeylessBackupPhoneInput.tsx 83.56% <86.66%> (-0.57%) ⬇️

... and 88 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae8c4f0...221cdcc. Read the comment docs.


const navigatedFromSettings = origin === KeylessBackupOrigin.Settings
const isOnboarding = origin === KeylessBackupOrigin.Onboarding
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need both navigatedFromSettings and isOnboarding? One being true should imply that the other is false (unless we have some plan to have a 3rd way to get to CAB).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We don't need both, but using isOnboarding is more explicit and will keep working if we add another origin.

Copy link
Contributor

Choose a reason for hiding this comment

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

don't feel too strongly on this, but looking at the component, it feels a bit arbitrary on when to use which boolean as some use expressions isOnboarding and some others use navigatedFromSettings.

Copy link
Collaborator Author

@MuckT MuckT Jul 11, 2024

Choose a reason for hiding this comment

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

Replaced instances of navigatedFromSettings with isOnboarding and swapped the tertiaries in 221cdcc.

Base automatically changed from tomm/act-1219 to main July 10, 2024 03:36
src/analytics/Properties.tsx Show resolved Hide resolved
src/keylessBackup/KeylessBackupProgress.tsx Outdated Show resolved Hide resolved

const navigatedFromSettings = origin === KeylessBackupOrigin.Settings
const isOnboarding = origin === KeylessBackupOrigin.Onboarding
Copy link
Contributor

Choose a reason for hiding this comment

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

don't feel too strongly on this, but looking at the component, it feels a bit arbitrary on when to use which boolean as some use expressions isOnboarding and some others use navigatedFromSettings.

src/keylessBackup/KeylessBackupProgress.tsx Show resolved Hide resolved
src/keylessBackup/KeylessBackupProgress.tsx Outdated Show resolved Hide resolved
src/keylessBackup/KeylessBackupProgress.tsx Show resolved Hide resolved
src/keylessBackup/KeylessBackupProgress.tsx Outdated Show resolved Hide resolved
src/keylessBackup/KeylessBackupProgress.tsx Outdated Show resolved Hide resolved
@MuckT MuckT added this pull request to the merge queue Jul 12, 2024
Merged via the queue into main with commit 29245f3 Jul 12, 2024
16 checks passed
@MuckT MuckT deleted the tomm/act-1233 branch July 12, 2024 18:02
github-merge-queue bot pushed a commit that referenced this pull request Aug 6, 2024
### Description

Change cta for restore back to "Restoring your wallet", fixing a bug
introduced in #5611

### Test plan

Manually restoring and checking the CTA

### Related issues

N/A

### Backwards compatibility

Yes

### Network scalability

N/A
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.

3 participants