Merge pull request #4171 from jedwardmook/WV-661

[TEAM REVIEW] https://wevoteusa.atlassian.net/browse/WV-661 - fixes from last meeting 11-7
wevote · Nov 14, 2024 · 2ce761d · 2ce761d
2 parents d63e2f9 + 69a23c9
commit 2ce761d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/js/components/Activity/ActivityPostAdd.jsx b/src/js/components/Activity/ActivityPostAdd.jsx
@@ -78,7 +78,7 @@ class ActivityPostAdd extends Component {
 
   render () {
     renderLog('ActivityPostAdd');  // Set LOG_RENDER_EVENTS to log all renders
-    const { classes, externalUniqueId } = this.props;
+    const { classes, externalUniqueId, activityTidbitWeVoteId } = this.props;
     const {
       showActivityPostModal,
       voterPhotoUrlMedium, statementText,
@@ -146,7 +146,7 @@ class ActivityPostAdd extends Component {
           {showActivityPostModal && (
             <Suspense fallback={<></>}>
               <ActivityPostModal
-                activityPostWeVoteId=""
+                activityTidbitWeVoteId={activityTidbitWeVoteId}
                 externalUniqueId={externalUniqueId}
                 show={showActivityPostModal}
                 toggleModal={this.toggleActivityPostModal}
@@ -161,6 +161,7 @@ class ActivityPostAdd extends Component {
 ActivityPostAdd.propTypes = {
   externalUniqueId: PropTypes.string,
   classes: PropTypes.object,
+  activityTidbitWeVoteId: PropTypes.string,
 };
 
 const styles = (theme) => ({

diff --git a/src/js/components/Activity/ActivityPostModal.jsx b/src/js/components/Activity/ActivityPostModal.jsx
@@ -65,8 +65,8 @@ const ActivityPostModal = (props) => {
     }
   }, [initialFocusSet]);
 
-  onBlurInput = () => {
-  };
+  // onBlurInput = () => {
+  // };
 
   const onFocusInput = () => {
     prepareForCordovaKeyboard('ActivityPostModal');
@@ -88,17 +88,19 @@ const ActivityPostModal = (props) => {
     setStatementText(e.target.value);
   };
 
+  const activityTidbitIdCheck = activityTidbitWeVoteId === '' || activityTidbitWeVoteId === undefined;
+
   renderLog('ActivityPostModal'); // Set LOG_RENDER_EVENTS to log all renders
 
-  const dialogTitleText = activityTidbitWeVoteId === '' ? 'Create Post' : 'Edit Post';
+  const dialogTitleText = activityTidbitIdCheck ? 'Create Post' : 'Edit Post';
   const statementPlaceholderText = 'What\'s on your mind?';
   const rowsToShow = isAndroid() ? 4 : 6;
 
   const textFieldJSX = (
     <TextFieldWrapper>
       <TextFieldForm
         className={classes.formStyles}
-        onBlur={onBlurInput}
+        // onBlur={onBlurInput}
         onFocus={onFocusInput}
         onSubmit={saveActivityPost}
       >
@@ -133,7 +135,7 @@ const ActivityPostModal = (props) => {
             type="submit"
             disabled={!statementText}
           >
-            {activityTidbitWeVoteId === '' ? 'Post' : 'Save Changes'}
+            {activityTidbitIdCheck ? 'Post' : 'Save Changes'}
           </Button>
         </PostSaveButton>
       </TextFieldForm>

diff --git a/src/js/pages/Activity/News.jsx b/src/js/pages/Activity/News.jsx
@@ -326,7 +326,9 @@ class News extends Component {
                   <>
                     {voterIsSignedIn && (
                       <ActivityPostAddWrapper style={reduceConstraintsIfCordova}>
-                        <ActivityPostAdd />
+                        <ActivityPostAdd
+                          activityTidbitWeVoteId={activityTidbitWeVoteId}
+                        />
                       </ActivityPostAddWrapper>
                     )}
                     {voterIsSignedIn && (