Revert "Deep link to add secondary login in OldDot"

src/languages/en.js

@@ -675,13 +675,13 @@ export default {
             headerWithEcard: 'Cards are ready!',
             noVBACopy: 'Connect a bank account to issue unlimited Expensify Cards for your workspace members and access all of these incredible benefits:',
             VBANoECardCopy: 'Add a work email address to issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:',
+            conciergeCanHelp: 'Concierge can help you add a work email address to enable the Expensify Card.',
             VBAWithECardCopy: 'Enjoy all these incredible benefits:',
             benefit1: 'Up to 2% cash back',
             benefit2: 'Digital and physical cards',
             benefit3: 'No personal liability',
             benefit4: 'Customizable limits',
-            addWorkEmail: 'Add work email address',
-            checkingDomain: 'Hang tight! We are still working on enabling your Expensify Cards. Check back here in a few minutes.',
+            chatWithConcierge: 'Chat with Concierge',
         },
         reimburse: {
             captureReceipts: 'Capture receipts',
@@ -745,9 +745,9 @@ export default {
             streamlinePayments: 'Streamline payments',
             oneMoreThing: 'One more thing!',
             allSet: 'You\'re all set!',
-            accountDescriptionNoCards: 'This bank account will be used to reimburse expenses, collect invoices, and pay bills all from the same account.\n\nPlease add a work email address as a secondary login to enable the Expensify Card.',
+            accountDescriptionNoCards: 'This bank account will be used to reimburse expenses, collect invoices, and pay bills all from the same account.\n\nConcierge can help you add a work email address to enable the Expensify Card.',
             accountDescriptionWithCards: 'This bank account will be used to issue corporate cards, reimburse expenses, collect invoices, and pay bills all from the same account.',
-            addWorkEmail: 'Add work email address',
+            chatWithConcierge: 'Chat with Concierge',
             letsFinishInChat: 'Let\'s finish in chat!',
             almostDone: 'Almost done!',
             disconnectBankAccount: 'Disconnect bank account',

src/languages/es.js

@@ -677,13 +677,13 @@ export default {
             headerWithEcard: '¡Tus tarjetas están listas!',
             noVBACopy: 'Conecta una cuenta bancaria para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
             VBANoECardCopy: 'Agrega tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
+            conciergeCanHelp: 'Concierge te puede ayudar a añadir un correo electrónico de trabajo para activar la Tarjeta Expensify.',
             VBAWithECardCopy: 'Disfruta de todas estas increíbles ventajas:',
             benefit1: 'Hasta un 2% de devolución en tus gastos',
             benefit2: 'Tarjetas digitales y físicas',
             benefit3: 'Sin responsabilidad personal',
             benefit4: 'Límites personalizables',
-            addWorkEmail: 'Añadir correo electrónico de trabajo',
-            checkingDomain: '¡Un momento! Estamos todavía trabajando para habilitar tu Tarjeta Expensify. Vuelve aquí en unos minutos.',
+            chatWithConcierge: 'Chatea con Concierge',
         },
         reimburse: {
             captureReceipts: 'Captura recibos',
@@ -747,9 +747,9 @@ export default {
             streamlinePayments: 'Optimiza pagos',
             oneMoreThing: '¡Una cosa más!',
             allSet: '¡Todo listo!',
-            accountDescriptionNoCards: 'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.\n\nPor favor añade un correo electrónico de trabajo como tu nombre de usuario secundario para activar la Tarjeta Expensify.',
+            accountDescriptionNoCards: 'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta. Concierge puede ayudarte a añadir tu correo de trabajo para activar la Tarjeta Expensify.',
             accountDescriptionWithCards: 'Esta cuenta bancaria se utilizará para emitir tarjetas corporativas, reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.',
-            addWorkEmail: 'Añadir correo electrónico de trabajo',
+            chatWithConcierge: 'Chat con Concierge',
             letsFinishInChat: '¡Continuemos en el chat!',
             almostDone: '¡Casi listo!',
             disconnectBankAccount: 'Desconectar cuenta bancaria',

src/libs/Pusher/EventType.js

@@ -7,5 +7,4 @@ export default {
     REPORT_COMMENT_EDIT: 'reportCommentEdit',
     REPORT_TOGGLE_PINNED: 'reportTogglePinned',
     PREFERRED_LOCALE: 'preferredLocale',
-    EXPENSIFY_CARD_UPDATE: 'expensifyCardUpdate',
 };

src/libs/actions/User.js

@@ -284,30 +284,6 @@ function subscribeToUserEvents() {
         });
 }
 
-function subscribeToExpensifyCardUpdates() {
-    const pusherChannelName = `private-user-accountID-${currentUserAccountID}`;
-
-    // Handle Expensify Card approval flow updates
-    Pusher.subscribe(pusherChannelName, Pusher.TYPE.EXPENSIFY_CARD_UPDATE, (pushJSON) => {
-        if (pushJSON.isUsingExpensifyCard) {
-            Onyx.merge(ONYXKEYS.USER, {isUsingExpensifyCard: pushJSON.isUsingExpensifyCard, isCheckingDomain: null});
-            Pusher.unsubscribe(pusherChannelName, Pusher.TYPE.EXPENSIFY_CARD_UPDATE);
-        } else {
-            Onyx.merge(ONYXKEYS.USER, {isCheckingDomain: pushJSON.isCheckingDomain});
-        }
-    }, false,
-    () => {
-        NetworkConnection.triggerReconnectionCallbacks('pusher re-subscribed to private user channel');
-    })
-        .catch((error) => {
-            Log.info(
-                '[User] Failed to subscribe to Pusher channel',
-                false,
-                {error, pusherChannelName, eventName: Pusher.TYPE.EXPENSIFY_CARD_UPDATE},
-            );
-        });
-}
-
 /**
  * Sync preferredSkinTone with Onyx and Server
  * @param {String} skinTone
@@ -342,5 +318,4 @@ export {
     setPreferredSkinTone,
     setShouldUseSecureStaging,
     clearUserErrorMessage,
-    subscribeToExpensifyCardUpdates,
 };

src/pages/ReimbursementAccount/EnableStep.js

@@ -10,19 +10,18 @@ import Navigation from '../../libs/Navigation/Navigation';
 import Text from '../../components/Text';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
-import {Mail, Close} from '../../components/Icon/Expensicons';
+import {ChatBubble, Close} from '../../components/Icon/Expensicons';
 import MenuItem from '../../components/MenuItem';
 import getBankIcon from '../../components/Icon/BankIcons';
 import {getPaymentMethods} from '../../libs/actions/PaymentMethods';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import bankAccountPropTypes from '../../components/bankAccountPropTypes';
+import {navigateToConciergeChat} from '../../libs/actions/Report';
 import confettiPop from '../../../assets/images/confetti-pop.gif';
 import Icon from '../../components/Icon';
 import WorkspaceSection from '../workspace/WorkspaceSection';
 import {ConciergeBlue} from '../../components/Icon/Illustrations';
 import {requestResetFreePlanBankAccount} from '../../libs/actions/BankAccounts';
-import {openOldDotLink} from '../../libs/actions/Link';
-import {subscribeToExpensifyCardUpdates} from '../../libs/actions/User';
 
 const propTypes = {
     /** Are we loading payment methods? */
@@ -73,11 +72,10 @@ class EnableStep extends React.Component {
         }];
         if (!isUsingExpensifyCard) {
             menuItems.unshift({
-                title: this.props.translate('workspace.bankAccount.addWorkEmail'),
-                icon: Mail,
+                title: this.props.translate('workspace.bankAccount.chatWithConcierge'),
+                icon: ChatBubble,
                 onPress: () => {
-                    openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
-                    subscribeToExpensifyCardUpdates();
+                    navigateToConciergeChat();
                 },
                 shouldShowRightIcon: true,
             });
@@ -113,11 +111,6 @@ class EnableStep extends React.Component {
                                 : this.props.translate('workspace.bankAccount.accountDescriptionWithCards')}
                         </Text>
                     </WorkspaceSection>
-                    {this.props.user.isCheckingDomain && (
-                        <Text style={[styles.formError, styles.m5]}>
-                            {this.props.translate('workspace.card.checkingDomain')}
-                        </Text>
-                    )}
                 </View>
             </View>
         );

src/pages/workspace/card/WorkspaceCardVBANoECardView.js

@@ -1,70 +1,55 @@
 import React from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
 import Text from '../../../components/Text';
 import styles from '../../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import {Mail} from '../../../components/Icon/Expensicons';
+import {Concierge} from '../../../components/Icon/Expensicons';
 import {JewelBoxBlue} from '../../../components/Icon/Illustrations';
 import UnorderedList from '../../../components/UnorderedList';
 import WorkspaceSection from '../WorkspaceSection';
+import {navigateToConciergeChat} from '../../../libs/actions/Report';
 import Navigation from '../../../libs/Navigation/Navigation';
-import {openOldDotLink} from '../../../libs/actions/Link';
-import {subscribeToExpensifyCardUpdates} from '../../../libs/actions/User';
-import ONYXKEYS from '../../../ONYXKEYS';
-import compose from '../../../libs/compose';
 
 const propTypes = {
     ...withLocalizePropTypes,
 };
 
 const WorkspaceCardVBANoECardView = props => (
-    <>
-        <WorkspaceSection
-            title={props.translate('workspace.card.header')}
-            icon={JewelBoxBlue}
-            menuItems={[
-                {
-                    title: props.translate('workspace.card.addWorkEmail'),
-                    onPress: () => {
-                        Navigation.dismissModal();
-                        openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
-                        subscribeToExpensifyCardUpdates();
-                    },
-                    icon: Mail,
-                    shouldShowRightIcon: true,
+    <WorkspaceSection
+        title={props.translate('workspace.card.header')}
+        icon={JewelBoxBlue}
+        menuItems={[
+            {
+                title: props.translate('workspace.card.chatWithConcierge'),
+                onPress: () => {
+                    Navigation.dismissModal();
+                    navigateToConciergeChat();
                 },
+                icon: Concierge,
+                shouldShowRightIcon: true,
+            },
+        ]}
+    >
+        <View style={[styles.mv4]}>
+            <Text>{props.translate('workspace.card.VBANoECardCopy')}</Text>
+        </View>
+
+        <UnorderedList
+            items={[
+                props.translate('workspace.card.benefit1'),
+                props.translate('workspace.card.benefit2'),
+                props.translate('workspace.card.benefit3'),
+                props.translate('workspace.card.benefit4'),
             ]}
-        >
-            <View style={[styles.mv4]}>
-                <Text>{props.translate('workspace.card.VBANoECardCopy')}</Text>
-            </View>
+        />
 
-            <UnorderedList
-                items={[
-                    props.translate('workspace.card.benefit1'),
-                    props.translate('workspace.card.benefit2'),
-                    props.translate('workspace.card.benefit3'),
-                    props.translate('workspace.card.benefit4'),
-                ]}
-            />
-        </WorkspaceSection>
-        {props.user.isCheckingDomain && (
-            <Text style={[styles.m5, styles.formError]}>
-                {props.translate('workspace.card.checkingDomain')}
-            </Text>
-        )}
-    </>
+        <View style={[styles.mv4]}>
+            <Text>{props.translate('workspace.card.conciergeCanHelp')}</Text>
+        </View>
+    </WorkspaceSection>
 );
 
 WorkspaceCardVBANoECardView.propTypes = propTypes;
 WorkspaceCardVBANoECardView.displayName = 'WorkspaceCardVBANoECardView';
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        user: {
-            key: ONYXKEYS.USER,
-        },
-    }),
-)(WorkspaceCardVBANoECardView);
+export default withLocalize(WorkspaceCardVBANoECardView);