resolve conflicts

Expensify · Nov 25, 2021 · 77a41fe · 77a41fe
1 parent 4aeec90
commit 77a41fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
@@ -19,18 +19,10 @@ import bankAccountPropTypes from '../../components/bankAccountPropTypes';
 import confettiPop from '../../../assets/images/confetti-pop.gif';
 import Icon from '../../components/Icon';
 import WorkspaceSection from '../workspace/WorkspaceSection';
-<<<<<<< HEAD
 import {ConciergeBlue} from '../../components/Icon/Illustrations';
 import {requestResetFreePlanBankAccount} from '../../libs/actions/BankAccounts';
 import {openOldDotLink} from '../../libs/actions/Link';
 import {subscribeToExpensifyCardUpdates} from '../../libs/actions/User';
-=======
-import * as Illustrations from '../../components/Icon/Illustrations';
-import * as BankAccounts from '../../libs/actions/BankAccounts';
-import * as Link from '../../libs/actions/Link';
-import * as User from '../../libs/actions/User';
-import CONST from '../../CONST';
->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL)
 
 const propTypes = {
     /** Are we loading payment methods? */
@@ -84,13 +76,8 @@ class EnableStep extends React.Component {
                 title: this.props.translate('workspace.bankAccount.addWorkEmail'),
                 icon: Mail,
                 onPress: () => {
-<<<<<<< HEAD
-                    openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
+                    openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
                     subscribeToExpensifyCardUpdates();
-=======
-                    Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
-                    User.subscribeToExpensifyCardUpdates();
->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL)
                 },
                 shouldShowRightIcon: true,
             });

diff --git a/src/pages/workspace/card/WorkspaceCardVBANoECardView.js b/src/pages/workspace/card/WorkspaceCardVBANoECardView.js
@@ -29,13 +29,8 @@ const WorkspaceCardVBANoECardView = props => (
                     title: props.translate('workspace.card.addWorkEmail'),
                     onPress: () => {
                         Navigation.dismissModal();
-<<<<<<< HEAD
-                        openOldDotLink('settings?param={"section":"account","openModal":"secondaryLogin"}');
+                        openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
                         subscribeToExpensifyCardUpdates();
-=======
-                        Link.openOldDotLink(CONST.ADD_SECONDARY_LOGIN_URL);
-                        User.subscribeToExpensifyCardUpdates();
->>>>>>> dd291dcda (Merge pull request #6479 from Expensify/cmartins-encodeURL)
                     },
                     icon: Mail,
                     shouldShowRightIcon: true,