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

Fix Password Forms Header Title #4410

Merged
merged 11 commits into from
Aug 5, 2021

Conversation

mananjadhav
Copy link
Collaborator

@mananjadhav mananjadhav commented Aug 4, 2021

@Jag96 Can you please review?

Details

  1. Add props to SignIn Layouts to cater to dynamic welcomeText
  2. Passed welcomeText prop to all the forms necessary
  3. Updated language files with content for welcomeText phrases

Fixed Issues

$ #4315

Tests

  1. Checked enter password page for all devices
  2. Checked set password page

QA Steps

Tested On

  • Web
  • Mobile Web
  • Desktop
  • iOS
  • Android

Screenshots

Web

enter-password-web

set-password

Mobile Web

enter-password-mweb

Desktop

enter-password-desktop

iOS

enter-password-ios

Android

enter-password-android

@mananjadhav mananjadhav requested a review from a team as a code owner August 4, 2021 18:21
@MelvinBot MelvinBot requested review from jasperhuangg and removed request for a team August 4, 2021 18:21
@mananjadhav
Copy link
Collaborator Author

@Jag96 PR Raised. Can someone verify the Spanish translations? I've picked from Google translate.

Copy link
Contributor

@jasperhuangg jasperhuangg left a comment

Choose a reason for hiding this comment

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

Looks good! Left some minor comments. I've also asked about your translations, will let you know about them when I get a response!

src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js Outdated Show resolved Hide resolved
src/pages/signin/SignInPage.js Outdated Show resolved Hide resolved
Comment on lines 111 to 112
phrase4: 'Welcome back to the New Expensify! Please set your password.',
phrase5: 'Welcome back to the New Expensify! Please enter your password.',
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's move these to the setPasswordPage translations here. Let's also give them more descriptive names like setYourPassword and enterYourPassword instead.

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've moved phrase4 to setPasswordPage.passwordFormTitle. phrase5 is retained in welcomeText as it is a part of the SiginInPage flow. Let me know if you still want me to change it?

src/pages/signin/SignInPage.js Outdated Show resolved Hide resolved
src/pages/signin/SignInPageLayout/index.js Outdated Show resolved Hide resolved
src/pages/SetPasswordPage.js Outdated Show resolved Hide resolved
src/languages/es.js Outdated Show resolved Hide resolved
src/languages/es.js Outdated Show resolved Hide resolved
jasperhuangg
jasperhuangg previously approved these changes Aug 5, 2021
Copy link
Contributor

@jasperhuangg jasperhuangg left a comment

Choose a reason for hiding this comment

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

Looks good! I heard back about the translations, so I'll commit those and get this merged, thanks!

@Jag96 Jag96 merged commit 9fa8099 into Expensify:main Aug 5, 2021
@OSBotify
Copy link
Contributor

OSBotify commented Aug 5, 2021

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Aug 6, 2021

🚀 Deployed to staging in version: 1.0.82-8🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @francoisl in version: 1.0.83-1 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 failure ❌
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

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.

4 participants