aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/assets/icons/notificationPrompts/invite-friends-prompt-icon.png (renamed from src/assets/icons/invite-friends-prompt-icon.png)bin153479 -> 153479 bytes
-rw-r--r--src/assets/icons/notificationPrompts/plus-logo.png (renamed from src/assets/icons/plus-logo.png)bin19640 -> 19640 bytes
-rw-r--r--src/assets/icons/notificationPrompts/private-accounts-prompt-icon.pngbin0 -> 126121 bytes
-rw-r--r--src/components/common/TaggPopup.tsx2
-rw-r--r--src/components/common/TaggPrompt.tsx12
-rw-r--r--src/components/notifications/NotificationPrompts.tsx15
-rw-r--r--src/components/profile/ProfileMoreInfoDrawer.tsx9
-rw-r--r--src/screens/main/NotificationsScreen.tsx3
-rw-r--r--src/screens/onboarding/OnboardingStepTwo.tsx2
-rw-r--r--src/screens/profile/EditProfile.tsx2
-rw-r--r--src/screens/profile/SettingsCell.tsx7
11 files changed, 33 insertions, 19 deletions
diff --git a/src/assets/icons/invite-friends-prompt-icon.png b/src/assets/icons/notificationPrompts/invite-friends-prompt-icon.png
index b9422b9f..b9422b9f 100644
--- a/src/assets/icons/invite-friends-prompt-icon.png
+++ b/src/assets/icons/notificationPrompts/invite-friends-prompt-icon.png
Binary files differ
diff --git a/src/assets/icons/plus-logo.png b/src/assets/icons/notificationPrompts/plus-logo.png
index 195f28fc..195f28fc 100644
--- a/src/assets/icons/plus-logo.png
+++ b/src/assets/icons/notificationPrompts/plus-logo.png
Binary files differ
diff --git a/src/assets/icons/notificationPrompts/private-accounts-prompt-icon.png b/src/assets/icons/notificationPrompts/private-accounts-prompt-icon.png
new file mode 100644
index 00000000..2432c546
--- /dev/null
+++ b/src/assets/icons/notificationPrompts/private-accounts-prompt-icon.png
Binary files differ
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<TaggPopupProps> = ({route, navigation}) => {
<View style={styles.popup}>
<Image
style={styles.icon}
- source={require('../../assets/icons/plus-logo.png')}
+ source={require('../../assets/icons/notificationPrompts/plus-logo.png')}
/>
<View style={styles.textContainer}>
<Text style={styles.header}>{messageHeader}</Text>
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<TaggPromptProps> = ({
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 (
+ <TaggPrompt
+ messageHeader={'Private or Public!'}
+ messageBody={
+ 'You can now choose to make your account private!\nHead over to the privacy tab in settings to check it out'
+ }
+ logoType={'private_accounts'}
+ hideCloseButton={true}
+ noPadding={true}
+ onClose={() => {}}
+ />
+ );
+};
+
interface SPPromptNotificationProps {
showSPNotifyPopUp: boolean;
}
diff --git a/src/components/profile/ProfileMoreInfoDrawer.tsx b/src/components/profile/ProfileMoreInfoDrawer.tsx
index f70f90d0..67e59747 100644
--- a/src/components/profile/ProfileMoreInfoDrawer.tsx
+++ b/src/components/profile/ProfileMoreInfoDrawer.tsx
@@ -36,13 +36,8 @@ const ProfileMoreInfoDrawer: React.FC<ProfileMoreInfoDrawerProps> = (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);
- }
+ navigation.navigate('SettingsScreen');
+ setIsOpen(false);
};
const onBlockUnblock = () => {
diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index 6fca679f..48e89f7a 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -18,6 +18,7 @@ import {checkPermission} from 'react-native-contacts';
import {TouchableOpacity} from 'react-native-gesture-handler';
import {SafeAreaView} from 'react-native-safe-area-context';
import {useDispatch, useSelector} from 'react-redux';
+import {PrivateAccountsPrompt} from '../../components/notifications/NotificationPrompts';
import {TabsGradient} from '../../components';
import {
InviteFriendsPrompt,
@@ -299,7 +300,7 @@ const NotificationsScreen: React.FC = () => {
renderItem={renderNotification}
renderSectionHeader={renderSectionHeader}
renderSectionFooter={renderSectionFooter}
- ListHeaderComponent={<InviteFriendsPrompt />}
+ ListHeaderComponent={<PrivateAccountsPrompt />}
refreshControl={
<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
}
diff --git a/src/screens/onboarding/OnboardingStepTwo.tsx b/src/screens/onboarding/OnboardingStepTwo.tsx
index a1100827..af7873e0 100644
--- a/src/screens/onboarding/OnboardingStepTwo.tsx
+++ b/src/screens/onboarding/OnboardingStepTwo.tsx
@@ -180,7 +180,7 @@ const OnboardingStepTwo: React.FC<OnboardingStepTwoProps> = ({
});
break;
case 400:
- Alert.alert(ERROR_REGISTRATION(Object.values(data)));
+ Alert.alert(ERROR_REGISTRATION(data.toLowerCase()));
break;
default:
Alert.alert(ERROR_SOMETHING_WENT_WRONG_REFRESH);
diff --git a/src/screens/profile/EditProfile.tsx b/src/screens/profile/EditProfile.tsx
index de950923..8b658043 100644
--- a/src/screens/profile/EditProfile.tsx
+++ b/src/screens/profile/EditProfile.tsx
@@ -383,7 +383,7 @@ const EditProfile: React.FC<EditProfileProps> = ({route, navigation}) => {
headerRight: () => (
<Button
title={'Save'}
- buttonStyle={{backgroundColor: 'transparent'}}
+ buttonStyle={{backgroundColor: 'transparent', marginRight: 15}}
titleStyle={{fontWeight: 'bold'}}
onPress={() => {
setLoading(true);
diff --git a/src/screens/profile/SettingsCell.tsx b/src/screens/profile/SettingsCell.tsx
index f5360242..852a29dc 100644
--- a/src/screens/profile/SettingsCell.tsx
+++ b/src/screens/profile/SettingsCell.tsx
@@ -35,7 +35,6 @@ const SettingsCell: React.FC<SettingsCellProps> = ({
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<SettingsCellProps> = ({
endExit: 'slide_out_right',
},
});
- } else Linking.openURL(url);
+ } else {
+ Linking.openURL(url);
+ }
} catch (error) {
Alert.alert(error.message);
}
@@ -128,7 +129,7 @@ const styles = StyleSheet.create({
},
subItemStyles: {position: 'absolute', right: 0},
preImageStyles: {width: SCREEN_WIDTH * 0.05, height: SCREEN_WIDTH * 0.05},
- postImageStyles: {width: 15, height: 15},
+ postImageStyles: {width: 10, height: 17},
titleContainerStyles: {marginLeft: '12%'},
titleStyles: {
fontSize: normalize(15),
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 18:48:43 +0000