From 976b6393d5d2be18e7b70447ef49f8d1b801b835 Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Mon, 29 Mar 2021 18:18:00 -0700 Subject: continued --- src/components/common/TaggPopup.tsx | 2 +- src/components/common/TaggPrompt.tsx | 12 +++++++----- src/components/notifications/NotificationPrompts.tsx | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) (limited to 'src/components') diff --git a/src/components/common/TaggPopup.tsx b/src/components/common/TaggPopup.tsx index 8b6865fd..f9929580 100644 --- a/src/components/common/TaggPopup.tsx +++ b/src/components/common/TaggPopup.tsx @@ -41,7 +41,7 @@ const TaggPopup: React.FC = ({route, navigation}) => { {messageHeader} diff --git a/src/components/common/TaggPrompt.tsx b/src/components/common/TaggPrompt.tsx index 6169b3f1..721b1eb8 100644 --- a/src/components/common/TaggPrompt.tsx +++ b/src/components/common/TaggPrompt.tsx @@ -2,12 +2,12 @@ import * as React from 'react'; import {StyleSheet, Text, TouchableOpacity} from 'react-native'; import {Image, View} from 'react-native-animatable'; import CloseIcon from '../../assets/ionicons/close-outline.svg'; -import {normalize, SCREEN_HEIGHT} from '../../utils'; +import {isIPhoneX, normalize, SCREEN_HEIGHT} from '../../utils'; type TaggPromptProps = { messageHeader: string; messageBody: string | Element; - logoType: 'plus' | 'tagg' | 'invite_friends'; + logoType: 'plus' | 'tagg' | 'invite_friends' | 'private_accounts'; hideCloseButton?: boolean; noPadding?: boolean; onClose: () => void; @@ -28,9 +28,11 @@ const TaggPrompt: React.FC = ({ const logo = () => { switch (logoType) { case 'plus': - return require('../../assets/icons/plus-logo.png'); + return require('../../assets/icons/notificationPrompts/plus-logo.png'); case 'invite_friends': - return require('../../assets/icons/invite-friends-prompt-icon.png'); + return require('../../assets/icons/notificationPrompts/invite-friends-prompt-icon.png'); + case 'private_accounts': + return require('../../assets/icons/notificationPrompts/private-accounts-prompt-icon.png'); case 'tagg': default: return require('../../assets/images/logo-purple.png'); @@ -66,7 +68,7 @@ const styles = StyleSheet.create({ justifyContent: 'center', alignItems: 'center', backgroundColor: 'white', - height: SCREEN_HEIGHT / 4, + height: isIPhoneX() ? SCREEN_HEIGHT / 6 : SCREEN_HEIGHT / 5, }, closeButton: { position: 'relative', diff --git a/src/components/notifications/NotificationPrompts.tsx b/src/components/notifications/NotificationPrompts.tsx index dc27925b..386b45e6 100644 --- a/src/components/notifications/NotificationPrompts.tsx +++ b/src/components/notifications/NotificationPrompts.tsx @@ -17,6 +17,21 @@ export const InviteFriendsPrompt: React.FC = () => { ); }; +export const PrivateAccountsPrompt: React.FC = () => { + return ( + {}} + /> + ); +}; + interface SPPromptNotificationProps { showSPNotifyPopUp: boolean; } -- cgit v1.2.3-70-g09d2 From 196779e9f404916f2a2ddad53728410761f488ac Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 30 Mar 2021 14:12:31 -0400 Subject: remove check for SP to settings --- src/components/profile/ProfileMoreInfoDrawer.tsx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/components') diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx index f70f90d0..5c5edf6c 100644 --- a/src/components/profile/ProfileMoreInfoDrawer.tsx +++ b/src/components/profile/ProfileMoreInfoDrawer.tsx @@ -36,13 +36,9 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { }; const goToSettingsPage = () => { - if (profile.suggested_people_linked === 0) { - Alert.alert(ERROR_ATTEMPT_EDIT_SP); - } else { - // Sending undefined for updatedSelectedBadges to mark that there was no update yet - navigation.navigate('SettingsScreen'); - setIsOpen(false); - } + // Sending undefined for updatedSelectedBadges to mark that there was no update yet + navigation.navigate('SettingsScreen'); + setIsOpen(false); }; const onBlockUnblock = () => { -- cgit v1.2.3-70-g09d2 From 4366feca828974b93d1211662f1fb6ee825a2374 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 30 Mar 2021 14:41:44 -0400 Subject: removed comments --- src/components/profile/ProfileMoreInfoDrawer.tsx | 1 - src/screens/profile/SettingsCell.tsx | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/components') diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx index 5c5edf6c..67e59747 100644 --- a/src/components/profile/ProfileMoreInfoDrawer.tsx +++ b/src/components/profile/ProfileMoreInfoDrawer.tsx @@ -36,7 +36,6 @@ const ProfileMoreInfoDrawer: React.FC = (props) => { }; const goToSettingsPage = () => { - // Sending undefined for updatedSelectedBadges to mark that there was no update yet navigation.navigate('SettingsScreen'); setIsOpen(false); }; diff --git a/src/screens/profile/SettingsCell.tsx b/src/screens/profile/SettingsCell.tsx index f5360242..96eceecc 100644 --- a/src/screens/profile/SettingsCell.tsx +++ b/src/screens/profile/SettingsCell.tsx @@ -35,7 +35,6 @@ const SettingsCell: React.FC = ({ if (suggested_people_linked === 0) { Alert.alert(ERROR_ATTEMPT_EDIT_SP); } else { - // Sending undefined for updatedSelectedBadges to mark that there was no update yet navigateTo('UpdateSPPicture', { editing: true, }); @@ -85,7 +84,9 @@ const SettingsCell: React.FC = ({ endExit: 'slide_out_right', }, }); - } else Linking.openURL(url); + } else { + Linking.openURL(url); + } } catch (error) { Alert.alert(error.message); } -- cgit v1.2.3-70-g09d2