feat(forms): synchronize form labels and placeholders

blockchain · May 9, 2022 · 91477b1 · 91477b1
1 parent c020291
commit 91477b1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/HelpExchange/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/HelpExchange/index.tsx
@@ -147,10 +147,7 @@ class Help extends React.PureComponent<InjectedFormProps<{}, Props> & Props> {
                 <FormGroup>
                   <FormItem style={{ marginTop: '30px' }}>
                     <FormLabel htmlFor='email'>
-                      <FormattedMessage
-                        id='scenes.register.youremail'
-                        defaultMessage='Your Email'
-                      />
+                      <FormattedMessage id='scenes.register.youremail' defaultMessage='Email' />
                     </FormLabel>
                     <Field
                       component={TextBox}
@@ -159,7 +156,7 @@ class Help extends React.PureComponent<InjectedFormProps<{}, Props> & Props> {
                       name='email'
                       normalize={removeWhitespace}
                       validate={[required, validEmail]}
-                      placeholder='Enter your email'
+                      placeholder='Enter Email'
                       autoFocus
                     />
                   </FormItem>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/EnterEmail/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/EnterEmail/index.tsx
@@ -41,7 +41,7 @@ const EnterEmail = (props: Props) => {
         <FormGroup>
           <FormItem style={{ marginTop: '40px' }}>
             <LoginFormLabel htmlFor='exchangeEmail'>
-              <FormattedMessage id='scenes.register.youremail' defaultMessage='Your Email' />
+              <FormattedMessage id='scenes.register.youremail' defaultMessage='Email' />
             </LoginFormLabel>
             <Field
               component={TextBox}
@@ -50,7 +50,7 @@ const EnterEmail = (props: Props) => {
               name='exchangeEmail'
               normalize={removeWhitespace}
               validate={[required, validEmail]}
-              placeholder='Enter your email'
+              placeholder='Enter Email'
               autoFocus
             />
           </FormItem>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/EnterPassword/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/EnterPassword/index.tsx
@@ -67,7 +67,7 @@ const EnterPasswordExchange = (props: Props) => {
               component={PasswordBox}
               data-e2e='exchangePassword'
               name='exchangePassword'
-              placeholder='Enter your password'
+              placeholder='Enter Password'
               validate={[required]}
             />
             {passwordError && (

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/Institutional/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Exchange/Institutional/index.tsx
@@ -84,15 +84,14 @@ const InstitutionalPortal = (props: Props) => {
             <LoginFormLabel htmlFor='exchangeEmail'>
               <FormattedMessage id='copy.email' defaultMessage='Email' />
             </LoginFormLabel>
-
             <Field
               component={TextBox}
               data-e2e='exchangeEmail'
               disableSpellcheck
               name='exchangeEmail'
               normalize={removeWhitespace}
               validate={[required, validEmail]}
-              placeholder='Enter your email'
+              placeholder='Enter Email'
               autoFocus
             />
           </FormItem>
@@ -104,7 +103,7 @@ const InstitutionalPortal = (props: Props) => {
               component={PasswordBox}
               data-e2e='exchangePassword'
               name='exchangePassword'
-              placeholder='Enter your password'
+              placeholder='Enter Password'
               validate={[required]}
             />
             {passwordError && (

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/EnterEmailOrGuid/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/EnterEmailOrGuid/index.tsx
@@ -40,10 +40,7 @@ const EnterEmailOrGuid = (props: Props) => {
         <FormGroup>
           <FormItem style={{ marginTop: '40px' }}>
             <LoginFormLabel htmlFor='guid'>
-              <FormattedMessage
-                id='scenes.login.email_guid'
-                defaultMessage='Your Email or Wallet ID'
-              />
+              <FormattedMessage id='scenes.login.email_guid' defaultMessage='Email or Wallet ID' />
             </LoginFormLabel>
             <Field
               component={TextBox}
@@ -52,7 +49,7 @@ const EnterEmailOrGuid = (props: Props) => {
               name='guidOrEmail'
               normalize={removeWhitespace}
               validate={[required, validWalletIdOrEmail]}
-              placeholder='Enter email or wallet ID'
+              placeholder='Enter Email or Wallet ID'
               autoFocus
             />
           </FormItem>

diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/EnterPassword/index.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/Wallet/EnterPassword/index.tsx
@@ -130,22 +130,22 @@ const EnterPasswordWallet = (props: Props) => {
               <Text size='16px' weight={500} color='grey900' lineHeight='1.5'>
                 <FormattedMessage
                   id='scenes.login.enter_password.settings_goal.subtitle'
-                  defaultMessage='For your security, we ask you to enter your password to continue to update your  settings.'
+                  defaultMessage='For your security, we ask you to enter your password to continue to update your settings.'
                 />
               </Text>
             </SettingsGoalText>
           )}
           <FormGroup>
             <FormItem>
               <FormLabel htmlFor='password'>
-                <FormattedMessage id='scenes.login.your_password' defaultMessage='Your Password' />
+                <FormattedMessage id='scenes.login.your_password' defaultMessage='Password' />
               </FormLabel>
               <Field
                 autoFocus
                 component={PasswordBox}
                 data-e2e='loginPassword'
                 name='password'
-                placeholder='Enter your password'
+                placeholder='Enter Password'
                 validate={[required]}
               />
               {passwordError && (