From 3e5444b37bb8dccc7405cc9aa83da64181fd4746 Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Fri, 2 Jul 2021 11:22:51 -0400
Subject: Merge master with this brach.

---
 src/screens/profile/CaptionScreen.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/screens/profile/CaptionScreen.tsx')

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 05db8ed7..28e8808f 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -210,7 +210,9 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
                 title="Cancel"
                 buttonStyle={styles.button}
                 onPress={() =>
-                  moment ? navigation.goBack() : navigateToProfile()
+                  // There is issue here with navigations on the commented code below
+                  // moment ? navigation.goBack() : navigateToProfile()
+                  navigation.goBack()
                 }
               />
               <Button
-- 
cgit v1.2.3-70-g09d2


From d2347eef0e22c7d47f090e6ce0a8a2c50506c894 Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Fri, 2 Jul 2021 16:10:30 -0400
Subject: Removed the comment about the navigation error.

---
 src/screens/profile/CaptionScreen.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/screens/profile/CaptionScreen.tsx')

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 28e8808f..fac00f21 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -209,11 +209,7 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               <Button
                 title="Cancel"
                 buttonStyle={styles.button}
-                onPress={() =>
-                  // There is issue here with navigations on the commented code below
-                  // moment ? navigation.goBack() : navigateToProfile()
-                  navigation.goBack()
-                }
+                onPress={() => navigation.goBack()}
               />
               <Button
                 title={moment ? 'Done' : 'Share'}
-- 
cgit v1.2.3-70-g09d2