diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
| commit | 0dd0a4ac4343df036a1f16cbde070c524405bd21 (patch) | |
| tree | 292a30ce0228560720214645805deb4b89f2eeae /src/screens/onboarding/Login.tsx | |
| parent | 5c438df5f6787cdc6c393873a98590cc827667b9 (diff) | |
| parent | 4e8e1c0d58424e6b63cfb8470fc0a73c0e6b102b (diff) | |
Merge branch 'master' into hotfix-linting-fixup
# Conflicts:
# .eslintrc.js
# src/components/notifications/Notification.tsx
# src/screens/onboarding/legacy/SocialMedia.tsx
# src/screens/onboarding/legacy/WaitlistSuccessScreen.tsx
# src/screens/profile/CategorySelection.tsx
Diffstat (limited to 'src/screens/onboarding/Login.tsx')
| -rw-r--r-- | src/screens/onboarding/Login.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/screens/onboarding/Login.tsx b/src/screens/onboarding/Login.tsx index 6d9abf82..041fba05 100644 --- a/src/screens/onboarding/Login.tsx +++ b/src/screens/onboarding/Login.tsx @@ -30,7 +30,7 @@ import {fcmService} from '../../services'; import {RootState} from '../../store/rootReducer'; import {BackgroundGradientType, UniversityType} from '../../types'; import {connectChatAccount, normalize, userLogin} from '../../utils'; -import UpdateRequired from './UpdateRequired'; +import UpdateRequired from '../../components/onboarding/UpdateRequired'; type VerificationScreenRouteProp = RouteProp<OnboardingStackParams, 'Login'>; type VerificationScreenNavigationProp = StackNavigationProp< |