Merge pull request #27498 from Expensify/georgia-removeMWebDownload

Remove mWeb Download Banner
Expensify · Sep 18, 2023 · 01c5b71 · 01c5b71
2 parents ea5f461 + 0ede2e6
commit 01c5b71
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 122 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -30,7 +30,6 @@ import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import DownloadAppModal from './components/DownloadAppModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
@@ -193,7 +192,6 @@ function Expensify(props) {
         <DeeplinkWrapper isAuthenticated={isAuthenticated}>
             {shouldInit && (
                 <>
-                    <DownloadAppModal isAuthenticated={isAuthenticated} />
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -87,9 +87,6 @@ const ONYXKEYS = {
     SESSION: 'session',
     BETAS: 'betas',
 
-    /** Denotes if the Download App Banner has been dismissed */
-    SHOW_DOWNLOAD_APP_BANNER: 'showDownloadAppBanner',
-
     /** NVP keys
      * Contains the user's payPalMe data */
     PAYPAL: 'paypal',
@@ -307,7 +304,6 @@ type OnyxValues = {
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
-    [ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER]: boolean;
     [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.Request[];
     [ONYXKEYS.QUEUED_ONYX_UPDATES]: OnyxTypes.QueuedOnyxUpdates;
     [ONYXKEYS.CURRENT_DATE]: string;

diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
@@ -100,8 +100,8 @@ function ConfirmContent(props) {
                         <View style={[styles.flexRow, styles.mb3]}>
                             <Icon
                                 src={props.iconSource}
-                                width={variables.downloadAppModalAppIconSize}
-                                height={variables.downloadAppModalAppIconSize}
+                                width={variables.appModalAppIconSize}
+                                height={variables.appModalAppIconSize}
                                 additionalStyles={[...props.iconAdditionalStyles]}
                             />
                         </View>

diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -344,11 +344,6 @@ export default {
             `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
-    DownloadAppModal: {
-        downloadTheApp: 'Download the app',
-        keepTheConversationGoing: 'Keep the conversation going in New Expensify, download the app for an enhanced experience.',
-        noThanks: 'No thanks',
-    },
     login: {
         hero: {
             header: 'Split bills, request payments, and chat with friends.',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -335,11 +335,6 @@ export default {
             `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
-    DownloadAppModal: {
-        downloadTheApp: 'Descarga la aplicación',
-        keepTheConversationGoing: 'Mantén la conversación en New Expensify, descarga la aplicación para una experiencia mejorada.',
-        noThanks: 'No, gracias',
-    },
     login: {
         hero: {
             header: 'Divida las facturas, solicite pagos y chatee con sus amigos.',

diff --git a/src/libs/actions/DownloadAppModal.js b/src/libs/actions/DownloadAppModal.js
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -5,7 +5,6 @@ import lodashGet from 'lodash/get';
 import {View} from 'react-native';
 import styles from '../../../../styles/styles';
 import * as Expensicons from '../../../../components/Icon/Expensicons';
-import * as Browser from '../../../../libs/Browser';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
 import NAVIGATORS from '../../../../NAVIGATORS';
@@ -61,9 +60,6 @@ const propTypes = {
     /** Indicated whether the report data is loading */
     isLoading: PropTypes.bool,
 
-    /** For first time users, whether the download app banner should show */
-    shouldShowDownloadAppBanner: PropTypes.bool,
-
     /** Forwarded ref to FloatingActionButtonAndPopover */
     innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
 };
@@ -74,7 +70,6 @@ const defaultProps = {
     betas: [],
     isLoading: false,
     innerRef: null,
-    shouldShowDownloadAppBanner: true,
 };
 
 /**
@@ -157,12 +152,9 @@ function FloatingActionButtonAndPopover(props) {
         if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
             return;
         }
-        // Avoid rendering the create menu for first-time users until they have dismissed the download app banner (mWeb only).
-        if (props.shouldShowDownloadAppBanner && Browser.isMobile()) {
-            return;
-        }
         Welcome.show({routes, showCreateMenu});
-    }, [props.shouldShowDownloadAppBanner, props.navigation, showCreateMenu, props.demoInfo]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     useEffect(() => {
         if (!didScreenBecomeInactive()) {
@@ -274,9 +266,6 @@ export default compose(
         isLoading: {
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
         },
-        shouldShowDownloadAppBanner: {
-            key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-        },
     }),
 )(
     forwardRef((props, ref) => (

diff --git a/src/styles/variables.ts b/src/styles/variables.ts
@@ -25,7 +25,7 @@ export default {
     componentBorderRadiusLarge: 16,
     componentBorderRadiusCard: 12,
     componentBorderRadiusRounded: 24,
-    downloadAppModalAppIconSize: 48,
+    appModalAppIconSize: 48,
     buttonBorderRadius: 100,
     avatarSizeLargeBordered: 88,
     avatarSizeLarge: 80,