From c740dd5b018e427c23fd41b8dc255df671eabc61 Mon Sep 17 00:00:00 2001
From: ankit-thanekar007 <ankit.thanekar007@gmail.com>
Date: Thu, 22 Apr 2021 15:55:49 -0700
Subject: PR Changes

---
 src/screens/badge/BadgeSelection.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index 0284498d..38a2b01c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -67,9 +67,13 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         onPress={async () => {
           if (editing) {
             await updateBadgesService(selectedBadges, university);
-            navigation.navigate('UpdateSPPicture', {
-              editing: true,
-            });
+            if (navigation.canGoBack()) {
+              navigation.goBack();
+            } else {
+              navigation.navigate('UpdateSPPicture', {
+                editing: true,
+              });
+            }
           } else {
             if (selectedBadges.length !== 0) {
               const success = await addBadgesService(
-- 
cgit v1.2.3-70-g09d2