Revert "Fix navigation from edit/add to upload queue"

This reverts commit ff7e583.

Author: Doris Tam

MaharaMobile/src/components/UploadForm/UploadForm.tsx

@@ -297,8 +297,8 @@ const UploadForm = (props: Props) => {
 
     // upon successful upload, remove the AddFile screen from the navigation stack
     props.navigation.dispatch(StackActions.popToTop());
-    // then take user to Upload queue screen
-    props.navigation.navigate('Upload queue tab', {added: true});
+    // then take user to PendingScreen
+    props.navigation.navigate('Pending', {added: true});
   };
 
   const updateTitle = (newTitle: string) => {
@@ -493,7 +493,7 @@ const UploadForm = (props: Props) => {
             navigation={props.navigation}
             onPress={() => {
               props.navigation.popToTop();
-              props.navigation.navigate('Upload queue tab');
+              props.navigation.navigate('Pending');
             }}
           />
         )}

MaharaMobile/src/navigation/StackNavigators.tsx

@@ -19,7 +19,7 @@ import LoginMethodScreen, {
   LoginMethodScreenOptions
 } from '../screens/LoginMethodScreen/LoginMethodScreen';
 import MenuScreen from '../screens/MenuScreen/MenuScreen';
-import UploadQueueScreen from '../screens/UploadQueueScreen/UploadQueueScreen';
+import PendingScreen from '../screens/PendingScreen/PendingScreen';
 import PreferencesScreen from '../screens/PreferencesScreen/PreferencesScreen';
 import PrivacyScreen from '../screens/PrivacyScreen/PrivacyScreen';
 import SelectMediaScreen from '../screens/SelectMediaScreen/SelectMediaScreen';
@@ -73,7 +73,7 @@ export const PendingItemsNavigator = () => (
   <PendingItems.Navigator screenOptions={headerConfigForTabStacks}>
     <PendingItems.Screen
       name="Pending"
-      component={UploadQueueScreen}
+      component={PendingScreen}
       options={{
         title: navigatorStrings().PENDING
       }}

MaharaMobile/src/screens/LoginMethodScreen/LoginMethodScreen.tsx

@@ -5,7 +5,6 @@ import React, {useEffect, useState} from 'react';
 import {Alert, View} from 'react-native';
 import {connect} from 'react-redux';
 import {Dispatch} from 'redux';
-import {CommonActions} from '@react-navigation/routers';
 import {
   addToken,
   setDefaultBlogId,
@@ -49,7 +48,6 @@ import {
 import {userBlogJSONtoUserBlog} from '../../utils/helperFunctions';
 import flashMessage from '../../components/FlashMessage/FlashMessage';
 import styles from '../../assets/styles/variables';
-import CustomVerifyBackButton from '../../components/UI/CustomVerifyBackButton/CustomVerifyBackButton';
 
 type Props = {
   dispatch: Dispatch;
@@ -224,11 +222,6 @@ export const LoginMethodScreenOptions = (navData) => {
 
   if (headerTitle === 'sso') {
     return {
-      headerLeft: (
-        <CustomVerifyBackButton
-          goBack={() => navData.navigation.dispatch(CommonActions.goBack())}
-        />
-      ),
       headerTitle: 'SSO'
     };
   }

MaharaMobile/src/screens/UploadQueueScreen/UploadQueueScreen.style.ts renamed to MaharaMobile/src/screens/PendingScreen/PendingScreen.style.ts

@@ -4,7 +4,7 @@ import {Provider} from 'react-redux';
 import renderer from 'react-test-renderer';
 import configureStore from 'redux-mock-store';
 import i18n from '../../i18n';
-import UploadQueueScreen from './UploadQueueScreen';
+import PendingScreen from './PendingScreen';
 
 jest.mock('rn-fetch-blob', () => {
   return true;
@@ -30,7 +30,7 @@ it('renders correctly', () => {
   renderer.create(
     <Provider store={mockStore(initialState)}>
       <I18nProvider i18n={i18n} language="en">
-        <UploadQueueScreen route={() => jest.mock('route', () => {})} />
+        <PendingScreen route={() => jest.mock('route', () => {})} />
       </I18nProvider>
     </Provider>
   );

MaharaMobile/src/screens/UploadQueueScreen/UploadQueueScreen.test.tsx renamed to MaharaMobile/src/screens/PendingScreen/PendingScreen.test.tsx

@@ -37,7 +37,7 @@ import {
 import {GUEST_USERNAME} from '../../utils/constants';
 import {uploadItemToMahara} from '../../utils/helperFunctions';
 // Styles
-import pendingScreenStyles from './UploadQueueScreen.style';
+import pendingScreenStyles from './PendingScreen.style';
 
 type Props = {
   uploadFiles: Array<PendingMFile>;
@@ -50,7 +50,7 @@ type Props = {
   route: {params: {added: boolean}};
 };
 
-const UploadQueueScreen = (props: Props) => {
+const PendingScreen = (props: Props) => {
   const numUploadFiles = props.uploadFiles.length;
   const numUploadJEntries = props.uploadJEntries.length;
   const numUploadItems = numUploadFiles + numUploadJEntries;
@@ -255,4 +255,4 @@ const mapStateToProps = (state: RootState) => ({
   userName: selectUserName(state)
 });
 
-export default connect(mapStateToProps)(UploadQueueScreen);
+export default connect(mapStateToProps)(PendingScreen);