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

PM-10617 + PM-11270 fixes after QA review #3944

Merged
merged 5 commits into from
Sep 19, 2024

Conversation

dseverns-livefront
Copy link
Collaborator

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-10617
https://bitwarden.atlassian.net/browse/PM-11270

📔 Objective

  • fix discrepancies in some of the copy shown on the new and "legacy" create account screens

📸 Screenshots

⏰ Reminders before review

  • Contributor guidelines followed
  • All formatters and local linters executed and passed
  • Written new unit and / or integration tests where applicable
  • Used internationalization (i18n) for all UI strings
  • CI builds passed
  • Communicated to DevOps any deployment requirements
  • Updated any necessary documentation or informed the documentation team

🦮 Reviewer guidelines

  • 👍 (:+1:) or similar for great changes
  • 📝 (:memo:) or ℹ️ (:information_source:) for notes or general info
  • ❓ (:question:) for questions
  • 🤔 (:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed
    issue and could potentially benefit from discussion
  • 🎨 (:art:) for suggestions / improvements
  • ❌ (:x:) or ⚠️ (:warning:) for more significant problems or concerns needing attention
  • 🌱 (:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt
  • ⛏ (:pick:) for minor or nitpick changes

Copy link
Contributor

github-actions bot commented Sep 19, 2024

Logo
Checkmarx One – Scan Summary & Details7e422684-3a53-4720-a69d-e44d864b9cf7

No New Or Fixed Issues Found

@@ -170,7 +170,7 @@ private fun SetPasswordScreenContent(
Spacer(modifier = Modifier.height(16.dp))

BitwardenTextField(
label = stringResource(id = R.string.master_password_hint),
label = stringResource(id = R.string.master_password_hint_optional),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why change the name?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmmm, I see why you did it now.

@SaintPatrck is this going to confuse Crowdin?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I can make the new one "m_p_h_not_optional" haha

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

not_specified *

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think that would work

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmmm, I see why you did it now.

@SaintPatrck is this going to confuse Crowdin?

I see you reverted renaming that resource so it's moot now, but for future reference, renaming will result in loss of existing translations for the resource being renamed.

Copy link
Collaborator

Choose a reason for hiding this comment

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

OK, thanks @SaintPatrck

label = stringResource(id = R.string.master_password),
label = stringResource(id = R.string.master_password_required)
.takeIf { showNewOnboardingUi }
?: stringResource(id = R.string.master_password),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could we do this instead?

label = stringResource(
    id = R.string.master_password_required
        .takeIf { showNewOnboardingUi }
        ?: R.string.master_password,
)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

making this change throughout the file for similar places

},
title = stringResource(id = R.string.create_account
.takeIf { state.onboardingEnabled }
?: R.string.set_password),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Formatting:

stringResource(
    id = R.string.create_account
        .takeIf { state.onboardingEnabled }
        ?: R.string.set_password,
),

Copy link

codecov bot commented Sep 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.85%. Comparing base (cdf8b49) to head (def1079).
Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3944   +/-   ##
=======================================
  Coverage   88.84%   88.85%           
=======================================
  Files         425      425           
  Lines       34885    34895   +10     
  Branches     5096     5105    +9     
=======================================
+ Hits        30995    31005   +10     
  Misses       2110     2110           
  Partials     1780     1780           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dseverns-livefront dseverns-livefront merged commit 21b41fd into main Sep 19, 2024
9 checks passed
@dseverns-livefront dseverns-livefront deleted the fix-onboarding-ca-texts branch September 19, 2024 21:26
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