Merge pull request #326 from gitjul/physician/unverified-register-mes…

…sage

Add link to registration form to the unverified user welcome message

client/.eslintrc.js

@@ -7,7 +7,7 @@ module.exports = {
     'prettier',
     'prettier/react',
   ],
-  plugins: ['jsx-a11y', 'prettier'],
+  plugins: ['jsx-a11y', 'prettier', 'react-hooks'],
   rules: {
     semi: 0,
     'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
@@ -26,6 +26,8 @@ module.exports = {
     'jsx-a11y/click-events-have-key-events': 'off',
     'react/no-unescaped-entities': 'off',
     'react/no-array-index-key': 'off',
-    'jsx-a11y/no-static-element-interactions': 'off'
+    'jsx-a11y/no-static-element-interactions': 'off',
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'warn',
   },
 };

client/public/locales/de/physicianView.json

@@ -1,11 +1,11 @@
 {
-  "welcome": "Welcome, ",
-  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
+  "welcome": "[DE] Welcome, {{userFullName}}",
+  "unverifiedUserMessage": "[DE] You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit <0>a Physician Registration form</0> if you have not already done so. Thank you.",
   "buttons": {
-    "answeredQuestions": "Answered Questions",
-    "unansweredQuestions": "Unanswered Questions",
-    "televideo": "Televideo",
-    "logOut": "Log out"
+    "answeredQuestions": "[DE] Answered Questions",
+    "unansweredQuestions": "[DE] Unanswered Questions",
+    "televideo": "[DE] Televideo",
+    "logOut": "[DE] Log out"
   },
-  "errorMessage": "Sorry, something went wrong!"
+  "errorMessage": "[DE] Sorry, something went wrong!"
 }

client/public/locales/en/physicianView.json

@@ -1,6 +1,6 @@
 {
-  "welcome": "Welcome, ",
-  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
+  "welcome": "Welcome, {{userFullName}}",
+  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit <0>a Physician Registration form</0> if you have not already done so. Thank you.",
   "buttons": {
     "answeredQuestions": "Answered Questions",
     "unansweredQuestions": "Unanswered Questions",

client/public/locales/hi-IN/physicianView.json

@@ -1,11 +1,11 @@
 {
-  "welcome": "Welcome, ",
-  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
+  "welcome": "[hi-IN] Welcome, {{userFullName}}",
+  "unverifiedUserMessage": "[hi-IN] You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit <0>a Physician Registration form</0> if you have not already done so. Thank you.",
   "buttons": {
-    "answeredQuestions": "Answered Questions",
-    "unansweredQuestions": "Unanswered Questions",
-    "televideo": "Televideo",
-    "logOut": "Log out"
+    "answeredQuestions": "[hi-IN] Answered Questions",
+    "unansweredQuestions": "[hi-IN] Unanswered Questions",
+    "televideo": "[hi-IN] Televideo",
+    "logOut": "[hi-IN] Log out"
   },
-  "errorMessage": "Sorry, something went wrong!"
+  "errorMessage": "[hi-IN] Sorry, something went wrong!"
 }

client/public/locales/ko-KR/physicianView.json

@@ -1,11 +1,11 @@
 {
-  "welcome": "Welcome, ",
-  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
+  "welcome": "[ko-KR] Welcome, {{userFullName}}",
+  "unverifiedUserMessage": "[ko-KR] You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit <0>a Physician Registration form</0> if you have not already done so. Thank you.",
   "buttons": {
-    "answeredQuestions": "Answered Questions",
-    "unansweredQuestions": "Unanswered Questions",
-    "televideo": "Televideo",
-    "logOut": "Log out"
+    "answeredQuestions": "[ko-KR] Answered Questions",
+    "unansweredQuestions": "[ko-KR] Unanswered Questions",
+    "televideo": "[ko-KR] Televideo",
+    "logOut": "[ko-KR] Log out"
   },
-  "errorMessage": "Sorry, something went wrong!"
+  "errorMessage": "[ko-KR] Sorry, something went wrong!"
 }

client/public/locales/zh-cn/physicianView.json

@@ -1,11 +1,11 @@
 {
-  "welcome": "Welcome, ",
-  "unverifiedUserMessage": "You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
+  "welcome": "[zh-cn] Welcome, ",
+  "unverifiedUserMessage": "[zh-cn] You have been granted READ-ONLY access to rate, review, and flag answers until your account has been verified. Please submit a Physician Registration form if you have not already done so. Thank you.",
   "buttons": {
-    "answeredQuestions": "Answered Questions",
-    "unansweredQuestions": "Unanswered Questions",
-    "televideo": "Televideo",
-    "logOut": "Log out"
+    "answeredQuestions": "[zh-cn] Answered Questions",
+    "unansweredQuestions": "[zh-cn] Unanswered Questions",
+    "televideo": "[zh-cn] Televideo",
+    "logOut": "[zh-cn] Log out"
   },
-  "errorMessage": "Sorry, something went wrong!"
+  "errorMessage": "[zh-cn] Sorry, something went wrong!"
 }

client/src/components/AnswerItem.js

@@ -2,7 +2,7 @@
 import React, { useState } from 'react';
 import { Trans, withTranslation } from 'react-i18next';
 import { ReactTinyLink } from 'react-tiny-link';
-import { List, Image, Label, Button, Icon } from 'semantic-ui-react';
+import { List, Image, Label } from 'semantic-ui-react';
 
 import clockIcon from '../assets/images/clockIcon.png';
 
@@ -44,10 +44,7 @@ const AnswerItem = (props) => {
               <img src={clockIcon} alt="clock_icon" height="11" width="11" />
             </span3>
             <span4>Posted: {firstAnsweredOn}</span4>
-            <span5>
-              Last Edited:{' '}
-              {lastAnsweredOn}
-            </span5>
+            <span5>Last Edited: {lastAnsweredOn}</span5>
           </div>
           <img
             src={props.answerByAvatarUrl || avatar}