diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-02-05 17:35:05 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-02-05 17:35:05 -0500 |
| commit | 231fed8c645dc29334b946dccca94fbb13116fe2 (patch) | |
| tree | fc7bcd0f9e11b943d89877c621e95681e89a18d7 /src/screens/onboarding | |
| parent | a5f746525df9bb2967c252b70e7a4e2f9daa2b8d (diff) | |
| parent | bad7fac394f8ef2870a9a139fd46d0def4421bf1 (diff) | |
Merge branch 'master' into TMA-579-Redesign-Snapchat-Tiktok
# Conflicts:
# src/components/common/TaggSquareButton.tsx
Diffstat (limited to 'src/screens/onboarding')
| -rw-r--r-- | src/screens/onboarding/CategorySelection.tsx | 5 | ||||
| -rw-r--r-- | src/screens/onboarding/ProfileOnboarding.tsx | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/screens/onboarding/CategorySelection.tsx b/src/screens/onboarding/CategorySelection.tsx index a3acbbb7..9d5fbe4d 100644 --- a/src/screens/onboarding/CategorySelection.tsx +++ b/src/screens/onboarding/CategorySelection.tsx @@ -17,7 +17,7 @@ import {Background, MomentCategory} from '../../components'; import {MOMENT_CATEGORIES} from '../../constants'; import {ERROR_SOMETHING_WENT_WRONG} from '../../constants/strings'; import {OnboardingStackParams} from '../../routes'; -import {fcmService, postMomentCategories} from '../../services'; +import {postMomentCategories} from '../../services'; import { updateIsOnboardedUser, updateMomentCategories, @@ -169,7 +169,6 @@ const CategorySelection: React.FC<CategorySelectionProps> = ({ const token = await getTokenOrLogout(dispatch); await postMomentCategories(selectedCategories, token); userLogin(dispatch, {userId: userId, username: username}); - fcmService.sendFcmTokenToServer(); } else { dispatch( updateMomentCategories( @@ -309,7 +308,7 @@ const styles = StyleSheet.create({ height: 40, borderRadius: 5, borderWidth: 1, - borderColor: '#8F01FF', + borderColor: 'white', marginBottom: '25%', }, finalActionLabel: { diff --git a/src/screens/onboarding/ProfileOnboarding.tsx b/src/screens/onboarding/ProfileOnboarding.tsx index 127cd9cd..26ad93a7 100644 --- a/src/screens/onboarding/ProfileOnboarding.tsx +++ b/src/screens/onboarding/ProfileOnboarding.tsx @@ -26,6 +26,7 @@ import { bioRegex, genderRegex, CLASS_YEAR_LIST, + TAGG_PURPLE, } from '../../constants'; import AsyncStorage from '@react-native-community/async-storage'; import {BackgroundGradientType} from '../../types'; @@ -549,7 +550,7 @@ const styles = StyleSheet.create({ borderRadius: 55, }, submitBtn: { - backgroundColor: '#8F01FF', + backgroundColor: TAGG_PURPLE, justifyContent: 'center', alignItems: 'center', width: SCREEN_WIDTH / 2.5, |