diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-22 19:07:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 19:07:04 -0400 |
| commit | 1f04e445e9d317bc141624a440a2c1e55f8704b3 (patch) | |
| tree | 1d38b38e527955481aac1c45de65f6cf7ef600d3 /src/screens/badge/BadgeSelection.tsx | |
| parent | e8913cc0bdc432c20a008e852482c82c3bb3c2a0 (diff) | |
| parent | ac082ed35d765f7182e95541d8eb9e2d9f033641 (diff) | |
Merge pull request #379 from ankit-thanekar007/tma-794-806-badge-profile-view
[TMA-794/806] Badge profile view
Diffstat (limited to 'src/screens/badge/BadgeSelection.tsx')
| -rw-r--r-- | src/screens/badge/BadgeSelection.tsx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 91617377..38a2b01c 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -66,10 +66,14 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => { style={styles.rightButtonContainer} onPress={async () => { if (editing) { - updateBadgesService(selectedBadges, university); - navigation.navigate('UpdateSPPicture', { - editing: true, - }); + await updateBadgesService(selectedBadges, university); + if (navigation.canGoBack()) { + navigation.goBack(); + } else { + navigation.navigate('UpdateSPPicture', { + editing: true, + }); + } } else { if (selectedBadges.length !== 0) { const success = await addBadgesService( |