From 315da6ba5d253e91c9f7b9b29638ddc048839537 Mon Sep 17 00:00:00 2001
From: Mehak Nasir <mehaknasir94@gmail.com>
Date: Tue, 4 Oct 2022 16:52:04 +0500
Subject: [PATCH] fix: ui text changes

---
 src/discussions/posts/PostsView.jsx                       | 4 +---
 src/discussions/posts/post-actions-bar/messages.js        | 4 ++--
 src/discussions/posts/post-filter-bar/PostFilterBar.jsx   | 8 +-------
 src/discussions/topics/messages.js                        | 4 ++--
 .../topics/topic-search-bar/TopicSearchBar.jsx            | 2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/discussions/posts/PostsView.jsx b/src/discussions/posts/PostsView.jsx
index d55739ad..5ed8c9f7 100644
--- a/src/discussions/posts/PostsView.jsx
+++ b/src/discussions/posts/PostsView.jsx
@@ -42,7 +42,6 @@ function PostsView() {
   const {
     topicId,
     category,
-    page,
   } = useContext(DiscussionContext);
   const dispatch = useDispatch();
   const searchString = useSelector(({ threads }) => threads.filters.search);
@@ -50,7 +49,6 @@ function PostsView() {
   const loadingStatus = useSelector(({ threads }) => threads.status);
 
   let postsListComponent;
-  const showOwnPosts = page === 'my-posts';
 
   if (topicId) {
     postsListComponent = <TopicPostsList topicId={topicId} />;
@@ -79,7 +77,7 @@ function PostsView() {
       {
         searchString && <SearchInfo count={resultsFound} text={searchString} loadingStatus={loadingStatus} onClear={() => dispatch(setSearchQuery(''))} />
       }
-      <PostFilterBar filterSelfPosts={showOwnPosts} />
+      <PostFilterBar />
       <div className="border-bottom border-light-400" />
       <div className="list-group list-group-flush flex-fill" role="list" onKeyDown={e => handleKeyDown(e)}>
         {postsListComponent}
diff --git a/src/discussions/posts/post-actions-bar/messages.js b/src/discussions/posts/post-actions-bar/messages.js
index 3640512a..b97d321e 100644
--- a/src/discussions/posts/post-actions-bar/messages.js
+++ b/src/discussions/posts/post-actions-bar/messages.js
@@ -13,9 +13,9 @@ const messages = defineMessages({
   search: {
     id: 'discussions.posts.actionBar.search',
     defaultMessage: `{page, select,
-      topics {Find a topic}
+      topics {Search topics}
       posts {Search all posts}
-      learners {Search learner}
+      learners {Search learners}
       myPosts {Search all posts}
       other {{page}}
     }`,
diff --git a/src/discussions/posts/post-filter-bar/PostFilterBar.jsx b/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
index 71ad31a6..0ba1d30f 100644
--- a/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
+++ b/src/discussions/posts/post-filter-bar/PostFilterBar.jsx
@@ -56,7 +56,6 @@ ActionItem.propTypes = {
 };
 
 function PostFilterBar({
-  filterSelfPosts,
   intl,
 }) {
   const dispatch = useDispatch();
@@ -120,7 +119,7 @@ function PostFilterBar({
       <Collapsible.Trigger className="collapsible-trigger border-0">
         <span className="text-primary-700 pr-4">
           {intl.formatMessage(messages.sortFilterStatus, {
-            own: filterSelfPosts,
+            own: false,
             type: currentFilters.postType,
             sort: currentSorting,
             status: currentFilters.status,
@@ -270,12 +269,7 @@ function PostFilterBar({
 }
 
 PostFilterBar.propTypes = {
-  filterSelfPosts: PropTypes.bool,
   intl: intlShape.isRequired,
 };
 
-PostFilterBar.defaultProps = {
-  filterSelfPosts: false,
-};
-
 export default injectIntl(PostFilterBar);
diff --git a/src/discussions/topics/messages.js b/src/discussions/topics/messages.js
index c0c6d409..fed8696d 100644
--- a/src/discussions/topics/messages.js
+++ b/src/discussions/topics/messages.js
@@ -21,9 +21,9 @@ const messages = defineMessages({
     defaultMessage: 'Course Structure',
     description: 'Option in dropdown to sort topics by course structure',
   },
-  findATopic: {
+  searchTopics: {
     id: 'discussions.topics.find.label',
-    defaultMessage: 'Find a topic',
+    defaultMessage: 'Search topics',
     description: 'Placeholder text in search bar',
   },
   archivedTopics: {
diff --git a/src/discussions/topics/topic-search-bar/TopicSearchBar.jsx b/src/discussions/topics/topic-search-bar/TopicSearchBar.jsx
index 080066ec..e2ac968b 100644
--- a/src/discussions/topics/topic-search-bar/TopicSearchBar.jsx
+++ b/src/discussions/topics/topic-search-bar/TopicSearchBar.jsx
@@ -14,7 +14,7 @@ function TopicSearchBar({ intl }) {
     <div className="d-flex flex-row p-1 align-items-center">
       <SearchField
         className="flex-fill m-1 border-0"
-        placeholder={intl.formatMessage(messages.findATopic)}
+        placeholder={intl.formatMessage(messages.searchTopics)}
         onSubmit={(query) => dispatch(setFilter(query))}
         onChange={(query) => dispatch(setFilter(query))}
       />