Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/images/car-plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/images/document-plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/components/Icon/Expensicons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import CreditCardLock from '@assets/images/credit-card-lock.svg';
import CreditCard from '@assets/images/creditcard.svg';
import Crop from '@assets/images/crop.svg';
import DocumentMerge from '@assets/images/document-merge.svg';
import DocumentPlus from '@assets/images/document-plus.svg';
import Document from '@assets/images/document.svg';
import DotIndicatorUnfilled from '@assets/images/dot-indicator-unfilled.svg';
import DotIndicator from '@assets/images/dot-indicator.svg';
Expand Down Expand Up @@ -207,6 +208,7 @@ export {
CircleSlash,
Document,
DocumentMerge,
DocumentPlus,
DotIndicator,
DotIndicatorUnfilled,
Download,
Expand Down
4 changes: 4 additions & 0 deletions src/components/Icon/chunks/expensify-icons.chunk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import Buildings from '@assets/images/buildings.svg';
import CalendarSolid from '@assets/images/calendar-solid.svg';
import Calendar from '@assets/images/calendar.svg';
import Camera from '@assets/images/camera.svg';
import CarPlus from '@assets/images/car-plus.svg';
import CarWithKey from '@assets/images/car-with-key.svg';
import Car from '@assets/images/car.svg';
import CaretUpDown from '@assets/images/caret-up-down.svg';
Expand Down Expand Up @@ -68,6 +69,7 @@ import CreditCard from '@assets/images/creditcard.svg';
import Crop from '@assets/images/crop.svg';
import Crosshair from '@assets/images/crosshair.svg';
import DocumentMerge from '@assets/images/document-merge.svg';
import DocumentPlus from '@assets/images/document-plus.svg';
import Document from '@assets/images/document.svg';
import DotIndicatorUnfilled from '@assets/images/dot-indicator-unfilled.svg';
import DotIndicator from '@assets/images/dot-indicator.svg';
Expand Down Expand Up @@ -282,6 +284,7 @@ const Expensicons = {
Calendar,
Camera,
Car,
CarPlus,
Cash,
CertiniaSquare,
ChatBubble,
Expand All @@ -308,6 +311,7 @@ const Expensicons = {
CircleSlash,
Document,
DocumentMerge,
DocumentPlus,
DotIndicator,
DotIndicatorUnfilled,
DownArrow,
Expand Down
274 changes: 274 additions & 0 deletions src/components/Navigation/QuickCreationActionsBar/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
import {emailSelector} from '@selectors/Session';
import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft';
import {Str} from 'expensify-common';
import React, {useCallback, useMemo} from 'react';
import {View} from 'react-native';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import Button from '@components/Button';
import {ModalActions} from '@components/Modal/Global/ModalContext';
import useConfirmModal from '@hooks/useConfirmModal';
import useCreateEmptyReportConfirmation from '@hooks/useCreateEmptyReportConfirmation';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useHasEmptyReportsForPolicy from '@hooks/useHasEmptyReportsForPolicy';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePermissions from '@hooks/usePermissions';
import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
import useThemeStyles from '@hooks/useThemeStyles';
import {startDistanceRequest, startMoneyRequest} from '@libs/actions/IOU';
import {openOldDotLink} from '@libs/actions/Link';
import {createNewReport} from '@libs/actions/Report';
import interceptAnonymousUser from '@libs/interceptAnonymousUser';
import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
import Navigation from '@libs/Navigation/Navigation';
import {openTravelDotLink} from '@libs/openTravelDotLink';
import Permissions from '@libs/Permissions';
import {areAllGroupPoliciesExpenseChatDisabled, getDefaultChatEnabledPolicy, isPaidGroupPolicy} from '@libs/PolicyUtils';
import {generateReportID, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import {primaryLoginSelector} from '@src/selectors/Account';
import {groupPaidPoliciesWithExpenseChatEnabledSelector} from '@src/selectors/Policy';
import type * as OnyxTypes from '@src/types/onyx';

function QuickCreationActionsBar() {
const styles = useThemeStyles();
const {translate} = useLocalize();
const icons = useMemoizedLazyExpensifyIcons(['ReceiptPlus', 'DocumentPlus', 'CarPlus', 'LuggageWithLines']);

const [session] = useOnyx(ONYXKEYS.SESSION);
const [email] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
const [allBetas] = useOnyx(ONYXKEYS.BETAS);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE);
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);
const [ownerBillingGraceEndPeriod] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
const [primaryLogin] = useOnyx(ONYXKEYS.ACCOUNT, {selector: primaryLoginSelector});
const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS);

const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const {isBetaEnabled} = usePermissions();
const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
const hasViolations = hasViolationsReportUtils(undefined, transactionViolations, session?.accountID ?? CONST.DEFAULT_NUMBER_ID, session?.email ?? '');
const {policyForMovingExpensesID, shouldSelectPolicy} = usePolicyForMovingExpenses();
const shouldNavigateToUpgradePath = !policyForMovingExpensesID && !shouldSelectPolicy;
const {showConfirmModal} = useConfirmModal();

const groupPaidPoliciesWithChatEnabledSelector = useCallback((policies: OnyxCollection<OnyxTypes.Policy>) => groupPaidPoliciesWithExpenseChatEnabledSelector(policies, email), [email]);
const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledSelector}, [email]);

const defaultChatEnabledPolicy = useMemo(
() => getDefaultChatEnabledPolicy(groupPoliciesWithChatEnabled as Array<OnyxEntry<OnyxTypes.Policy>>, activePolicy),
[activePolicy, groupPoliciesWithChatEnabled],
);
const defaultChatEnabledPolicyID = defaultChatEnabledPolicy?.id;

const hasEmptyReport = useHasEmptyReportsForPolicy(defaultChatEnabledPolicyID);
const [hasDismissedEmptyReportsConfirmation] = useOnyx(ONYXKEYS.NVP_EMPTY_REPORTS_CONFIRMATION_DISMISSED);
const shouldShowEmptyReportConfirmationForDefaultChatEnabledPolicy = hasEmptyReport && hasDismissedEmptyReportsConfirmation !== true;

const shouldRedirectToExpensifyClassic = useMemo(() => areAllGroupPoliciesExpenseChatDisabled((allPolicies as OnyxCollection<OnyxTypes.Policy>) ?? {}), [allPolicies]);

const travelEnabledPolicy = useMemo(() => Object.values(allPolicies ?? {}).find((policy) => !!policy?.isTravelEnabled), [allPolicies]);

const shouldShowBookTravel = !!travelEnabledPolicy;

const isBlockedFromSpotnanaTravel = Permissions.isBetaEnabled(CONST.BETAS.PREVENT_SPOTNANA_TRAVEL, allBetas);
const primaryContactMethod = primaryLogin ?? session?.email ?? '';
const isTravelReady = useMemo(() => {
if (!!isBlockedFromSpotnanaTravel || !primaryContactMethod || Str.isSMSLogin(primaryContactMethod) || !isPaidGroupPolicy(travelEnabledPolicy)) {
return false;
}

const isPolicyProvisioned = travelEnabledPolicy?.travelSettings?.spotnanaCompanyID ?? travelEnabledPolicy?.travelSettings?.associatedTravelDomainAccountID;

return travelEnabledPolicy?.travelSettings?.hasAcceptedTerms ?? (travelSettings?.hasAcceptedTerms && isPolicyProvisioned);
}, [travelEnabledPolicy, isBlockedFromSpotnanaTravel, primaryContactMethod, travelSettings?.hasAcceptedTerms]);

const showRedirectToExpensifyClassicModal = useCallback(async () => {
const {action} = await showConfirmModal({
title: translate('sidebarScreen.redirectToExpensifyClassicModal.title'),
prompt: translate('sidebarScreen.redirectToExpensifyClassicModal.description'),
confirmText: translate('exitSurvey.goToExpensifyClassic'),
cancelText: translate('common.cancel'),
});
if (action === ModalActions.CONFIRM) {
openOldDotLink(CONST.OLDDOT_URLS.INBOX);
}
}, [showConfirmModal, translate]);

const handleCreateWorkspaceReport = useCallback(
(shouldDismissEmptyReportsConfirmation?: boolean) => {
if (!defaultChatEnabledPolicy?.id) {
return;
}

const {reportID: createdReportID} = createNewReport(
currentUserPersonalDetails,
hasViolations,
isASAPSubmitBetaEnabled,
defaultChatEnabledPolicy,
allBetas,
false,
shouldDismissEmptyReportsConfirmation,
);
Navigation.setNavigationActionToMicrotaskQueue(() => {
Navigation.navigate(
isSearchTopmostFullScreenRoute()
? ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: createdReportID, backTo: Navigation.getActiveRoute()})
: ROUTES.REPORT_WITH_ID.getRoute(createdReportID, undefined, undefined, Navigation.getActiveRoute()),
);
});
},
[currentUserPersonalDetails, hasViolations, defaultChatEnabledPolicy, isASAPSubmitBetaEnabled, allBetas],
);

const {openCreateReportConfirmation, CreateReportConfirmationModal} = useCreateEmptyReportConfirmation({
policyID: defaultChatEnabledPolicyID,
policyName: defaultChatEnabledPolicy?.name ?? '',
onConfirm: handleCreateWorkspaceReport,
});
Comment on lines +132 to +136

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While using this hook, there was race condition which caused New report not created when clicked from Home tab quick action shortcuts.
More details: #86966 (comment)


const handleExpense = useCallback(
() =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
showRedirectToExpensifyClassicModal();
return;
}
startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID(), draftTransactionIDs);
}),
[draftTransactionIDs, shouldRedirectToExpensifyClassic, showRedirectToExpensifyClassicModal],
);

const handleReport = useCallback(
() =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
showRedirectToExpensifyClassicModal();
return;
}

if (shouldNavigateToUpgradePath) {
const freshReportID = generateReportID();
const freshTransactionID = generateReportID();
Navigation.navigate(
ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
action: CONST.IOU.ACTION.CREATE,
iouType: CONST.IOU.TYPE.CREATE,
transactionID: freshTransactionID,
reportID: freshReportID,
upgradePath: CONST.UPGRADE_PATHS.REPORTS,
}),
);
return;
}

const workspaceIDForReportCreation = defaultChatEnabledPolicyID;

if (
!workspaceIDForReportCreation ||
(shouldRestrictUserBillableActions(workspaceIDForReportCreation, undefined, undefined, ownerBillingGraceEndPeriod) && groupPoliciesWithChatEnabled.length > 1)
) {
Navigation.navigate(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute());
return;
}

if (!shouldRestrictUserBillableActions(workspaceIDForReportCreation, undefined, undefined, ownerBillingGraceEndPeriod)) {
if (shouldShowEmptyReportConfirmationForDefaultChatEnabledPolicy) {
openCreateReportConfirmation();
} else {
handleCreateWorkspaceReport(false);
}
return;
}
Comment on lines +175 to +190

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there's a possibility this could be a dead button for a case (ie click and do nothing) should we hide it or show a disabled UI?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't happen, handleCreateWorkspaceReport function calls navigate and openCreateReportConfirmation shows a modal window


Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(workspaceIDForReportCreation));
}),
[
shouldRedirectToExpensifyClassic,
showRedirectToExpensifyClassicModal,
shouldNavigateToUpgradePath,
defaultChatEnabledPolicyID,
ownerBillingGraceEndPeriod,
groupPoliciesWithChatEnabled.length,
shouldShowEmptyReportConfirmationForDefaultChatEnabledPolicy,
openCreateReportConfirmation,
handleCreateWorkspaceReport,
],
);

const handleDistance = useCallback(
() =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
showRedirectToExpensifyClassicModal();
return;
}
startDistanceRequest(CONST.IOU.TYPE.CREATE, generateReportID(), draftTransactionIDs, lastDistanceExpenseType);
}),
[draftTransactionIDs, lastDistanceExpenseType, shouldRedirectToExpensifyClassic, showRedirectToExpensifyClassicModal],
);

const handleBookTravel = useCallback(
() =>
interceptAnonymousUser(() => {
if (isTravelReady) {
openTravelDotLink(travelEnabledPolicy?.id);
return;
}
Navigation.navigate(ROUTES.TRAVEL_MY_TRIPS.getRoute(travelEnabledPolicy?.id));
}),
[travelEnabledPolicy?.id, isTravelReady],
);

return (
<>
{CreateReportConfirmationModal}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use <CreateReportConfirmationModal/> ? 😅

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it would require to refactor a bit useCreateEmptyReportConfirmation, we get from this hook React.ReactNode instead of the component function, so that's why it's passed this way.
This notation can also be found in other files

<View style={[styles.flexRow, styles.gap2, styles.pt1, styles.pb5]}>
<Button
small
icon={icons.ReceiptPlus}
text={translate('common.expense')}
onPress={handleExpense}
style={styles.quickCreationActionsBarButton}
textStyles={styles.quickCreationActionsBarButtonText}
/>
<Button
small
icon={icons.DocumentPlus}
text={translate('common.report')}
onPress={handleReport}
style={styles.quickCreationActionsBarButton}
textStyles={styles.quickCreationActionsBarButtonText}
/>
<Button
small
icon={icons.CarPlus}
text={translate('common.distance')}
onPress={handleDistance}
style={styles.quickCreationActionsBarButton}
textStyles={styles.quickCreationActionsBarButtonText}
/>
{shouldShowBookTravel && (
<Button
small
icon={icons.LuggageWithLines}
text={translate('travel.bookTravel')}
onPress={handleBookTravel}
style={styles.quickCreationActionsBarButton}
textStyles={styles.quickCreationActionsBarButtonText}
/>
)}
</View>
</>
);
}

export default QuickCreationActionsBar;
2 changes: 2 additions & 0 deletions src/pages/home/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, {useRef} from 'react';
import {View} from 'react-native';
import NavigationTabBar from '@components/Navigation/NavigationTabBar';
import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
import QuickCreationActionsBar from '@components/Navigation/QuickCreationActionsBar';
import TopBar from '@components/Navigation/TopBar';
import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
import ScreenWrapper from '@components/ScreenWrapper';
Expand Down Expand Up @@ -69,6 +70,7 @@ function HomePage() {
contentContainerStyle={styles.homePageContentContainer}
addBottomSafeAreaPadding
>
{!shouldUseNarrowLayout && <QuickCreationActionsBar />}
<View style={styles.homePageMainLayout(shouldUseNarrowLayout)}>
{/* Widgets handle their own visibility and may return null to avoid duplicating visibility logic here */}
<View style={styles.homePageLeftColumn(shouldUseNarrowLayout)}>
Expand Down
5 changes: 2 additions & 3 deletions src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {useIsFocused} from '@react-navigation/native';
import {primaryLoginSelector} from '@selectors/Account';
import {hasSeenTourSelector, tryNewDotOnyxSelector} from '@selectors/Onboarding';
import {groupPaidPoliciesWithExpenseChatEnabledSelector} from '@selectors/Policy';
import {Str} from 'expensify-common';
Expand Down Expand Up @@ -104,8 +105,6 @@ const policyMapper = (policy: OnyxEntry<OnyxTypes.Policy>): PolicySelector =>

const sessionSelector = (session: OnyxEntry<OnyxTypes.Session>) => ({email: session?.email, accountID: session?.accountID});

const accountPrimaryLoginSelector = (account: OnyxEntry<OnyxTypes.Account>) => account?.primaryLogin;

/**
* Responsible for rendering the {@link PopoverMenu}, and the accompanying
* FAB that can open or close the menu.
Expand Down Expand Up @@ -181,7 +180,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, ref
const [allBetas] = useOnyx(ONYXKEYS.BETAS);
const isBlockedFromSpotnanaTravel = Permissions.isBetaEnabled(CONST.BETAS.PREVENT_SPOTNANA_TRAVEL, allBetas);
const {isBetaEnabled} = usePermissions();
const [primaryLogin] = useOnyx(ONYXKEYS.ACCOUNT, {selector: accountPrimaryLoginSelector});
const [primaryLogin] = useOnyx(ONYXKEYS.ACCOUNT, {selector: primaryLoginSelector});
const primaryContactMethod = primaryLogin ?? session?.email ?? '';
const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS);
const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
Expand Down
Loading
Loading