From 29f88adda70f9621d1cc6524779184fee49c905c Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 24 May 2021 15:25:38 +0500
Subject: [PATCH 1/3] using category as tag if not already present in post meta

---
 src/components/postView/view/postDisplayView.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/postView/view/postDisplayView.js b/src/components/postView/view/postDisplayView.js
index 631e41303..bd6b5e82b 100644
--- a/src/components/postView/view/postDisplayView.js
+++ b/src/components/postView/view/postDisplayView.js
@@ -50,6 +50,8 @@ const PostDisplayView = ({
   const [refreshing, setRefreshing] = useState(false);
   const [postBodyLoading, setPostBodyLoading] = useState(false);
 
+  const [tags, setTags] = useState([]);
+
   // Component Life Cycles
   useEffect(() => {
     if (isLoggedIn && get(currentAccount, 'name') && !isNewPost) {
@@ -57,6 +59,16 @@ const PostDisplayView = ({
     }
   }, []);
 
+  useEffect(() => {
+    if (post) {
+      const _tags = post.json_metadata ? post.json_metadata.tags : [];
+      if (post.category && _tags[0] !== post.category) {
+        _tags.splice(0, 0, post.category);
+      }
+      setTags(_tags);
+    }
+  }, [post]);
+
   // Component Functions
   const onRefresh = useCallback(() => {
     setRefreshing(true);
@@ -216,7 +228,7 @@ const PostDisplayView = ({
               <PostBody body={post.body} onLoadEnd={_handleOnPostBodyLoad} />
               {!postBodyLoading && (
                 <View style={styles.footer}>
-                  <Tags tags={post.json_metadata && post.json_metadata.tags} />
+                  <Tags tags={tags} />
                   <Text style={styles.footerText}>
                     Posted by
                     <Text style={styles.footerName}>{` ${author || post.author} `}</Text>

From cdc417d906c3eb77f120ada5ce517df2fcf06a22 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 24 May 2021 15:41:51 +0500
Subject: [PATCH 2/3] shifted right tab bar icon slightly to left

---
 src/components/filterBar/view/filterBarStyles.js | 7 ++-----
 src/components/filterBar/view/filterBarView.tsx  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/filterBar/view/filterBarStyles.js b/src/components/filterBar/view/filterBarStyles.js
index 81adaa19c..a01f72739 100644
--- a/src/components/filterBar/view/filterBarStyles.js
+++ b/src/components/filterBar/view/filterBarStyles.js
@@ -29,11 +29,8 @@ export default EStyleSheet.create({
     justifyContent: 'space-between',
   },
   rightIconWrapper: {
-    marginRight: 8,
-    alignSelf: 'center',
-  },
-  customiseIconWrapper: {
-    paddingRight: 8,
+    paddingRight: 12,
+    width: 40,
     alignSelf: 'center',
   },
   rightIcon: {
diff --git a/src/components/filterBar/view/filterBarView.tsx b/src/components/filterBar/view/filterBarView.tsx
index 3bd2ef2e0..66a075bcc 100644
--- a/src/components/filterBar/view/filterBarView.tsx
+++ b/src/components/filterBar/view/filterBarView.tsx
@@ -50,7 +50,7 @@ const FilterBarView = ({
           enableCustomiseButton && (
             <IconButton 
               iconStyle={styles.rightIcon}
-              style={styles.customiseIconWrapper}
+              style={styles.rightIconWrapper}
               iconType={'MaterialIcon'}
               size={iconSize || 28}
               name={'add'}

From 112bb3dec63ccb3b6d4c7199b5a2d80a482d4038 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 24 May 2021 15:50:12 +0500
Subject: [PATCH 3/3] refined filter wrapper style

---
 src/components/filterBar/view/filterBarStyles.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/filterBar/view/filterBarStyles.js b/src/components/filterBar/view/filterBarStyles.js
index a01f72739..26dd5e869 100644
--- a/src/components/filterBar/view/filterBarStyles.js
+++ b/src/components/filterBar/view/filterBarStyles.js
@@ -19,8 +19,8 @@ export default EStyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-around',
     alignItems: 'center',
-    left: 5,
-    flex: 6,
+    marginRight: 8,
+    flex: 1,
   },
   filterBarWrapper: {
     flex: 1,