Merge branch 'master' into TMA-579-Redesign-Snapchat-Tiktok

# Conflicts:
#	src/components/common/TaggSquareButton.tsx

1 files changed, 3 insertions, 9 deletions

diff --git a/src/App.tsx b/src/App.tsx
index 18fadf64..ea3617dc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,17 +1,11 @@
-import React, {useEffect} from 'react';
 import {NavigationContainer} from '@react-navigation/native';
-import Routes from './routes';
+import React from 'react';
 import {Provider} from 'react-redux';
-import store from './store/configureStore';
-import {fcmService} from './services/FCMService';
 import {navigationRef} from './RootNavigation';
+import Routes from './routes';
+import store from './store/configureStore';
 
 const App = () => {
-  useEffect(() => {
-    fcmService.setUpPushNotifications();
-    // TODO: If permissions are not there, deactivateFcmService
-  });
-
   return (
     /**
      * This is the provider from the redux store, it acts as the root provider for our application