Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
49846f7
Extract shared context
gijoe0295 Jul 28, 2026
15f2b4d
Extract button row components
gijoe0295 Jul 28, 2026
e5eea08
Extract text content components
gijoe0295 Jul 28, 2026
72b5135
Extract util buttons
gijoe0295 Jul 28, 2026
c92cedc
Extract illustration component
gijoe0295 Jul 28, 2026
de6bf5f
Extract wrappers
gijoe0295 Jul 28, 2026
50275bf
Extract pagination components
gijoe0295 Jul 28, 2026
377ab2e
Extract scrollable wrapper hook
gijoe0295 Jul 28, 2026
c44aea7
Extract base component
gijoe0295 Jul 28, 2026
8db3044
Extract carousel component
gijoe0295 Jul 28, 2026
9006953
Extract types and export components
gijoe0295 Jul 28, 2026
898d33d
Use the new feature training carousel in AI features promo modal
gijoe0295 Jul 28, 2026
5a90684
Use the new feature training composition in feature training modal
gijoe0295 Jul 28, 2026
d025b95
Update FeatureTrainingModal usages
gijoe0295 Jul 28, 2026
40eb832
Update FeatureTraining composition usages
gijoe0295 Jul 28, 2026
a75cf5b
Update comment
gijoe0295 Jul 28, 2026
a3a014c
Update UI test usage
gijoe0295 Jul 28, 2026
7fc4b4a
Remove deprecated components
gijoe0295 Jul 28, 2026
92e2a57
Merge branch 'main' of github.com:gijoe0295/App into refactor/composi…
gijoe0295 Jul 28, 2026
c92fb92
Merge branch 'main' of github.com:gijoe0295/App into refactor/composi…
gijoe0295 Aug 12, 2026
fe2504e
Extract body text component
gijoe0295 Aug 12, 2026
aa82bba
Fix fmt
gijoe0295 Aug 12, 2026
9b131de
Probe measure body text instead
gijoe0295 Aug 12, 2026
bcd54c3
Update AIFeaturesPromoModal usage
gijoe0295 Aug 12, 2026
0ec3572
Update AutoSubmitModal usage
gijoe0295 Aug 12, 2026
6c40276
Update FeatureTrainingModal usages
gijoe0295 Aug 12, 2026
3b7713d
Remove ButtonRow in 1-button pages
gijoe0295 Aug 12, 2026
297eab8
Update MigratedUserWelcomeModal usage
gijoe0295 Aug 12, 2026
8f1a625
Update SubmitPlanWelcomeModal usage
gijoe0295 Aug 12, 2026
c46c150
Update ChangePolicyEducationalModal usage
gijoe0295 Aug 12, 2026
624e04b
Remove ButtonRow from UI test
gijoe0295 Aug 12, 2026
85562f5
Fix knip check
gijoe0295 Aug 12, 2026
3ca752d
Fix https://github.com/Expensify/App/issues/95853
gijoe0295 Aug 12, 2026
77b86f8
Let consumers call onClose in onConfirm
gijoe0295 Aug 13, 2026
14c6dcf
Fix CONSISTENCY-13
gijoe0295 Aug 13, 2026
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
107 changes: 66 additions & 41 deletions src/components/AIFeaturesPromoModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ import CONST from '@src/CONST';
import React from 'react';
import {View} from 'react-native';

import type {FeatureTrainingContentDataProps} from './FeatureTrainingContent';

import Badge from './Badge';
import CenteredModalLayout from './CenteredModalLayout';
import {FeatureTrainingCarousel} from './FeatureTrainingContent';
import FeatureTraining from './FeatureTraining';
import LottieAnimations from './LottieAnimations';
import Text from './Text';

Expand All @@ -38,34 +36,6 @@ function AIFeaturesPromoModal() {
</View>
);

const pages: FeatureTrainingContentDataProps[] = [
{
animation: LottieAnimations.SpendAnalysis,
title: translate('aiFeaturesPromoModal.spendAnalysis.title'),
subtitle: translate('aiFeaturesPromoModal.subtitle'),
description: translate('aiFeaturesPromoModal.spendAnalysis.description'),
confirmText: translate('common.next'),
},
{
animation: LottieAnimations.ExpenseAssistant,
title: translate('aiFeaturesPromoModal.expenseAssistant.title'),
subtitle: translate('aiFeaturesPromoModal.subtitle'),
description: translate('aiFeaturesPromoModal.expenseAssistant.description'),
confirmText: canUseCustomAgent ? translate('common.next') : translate('aiFeaturesPromoModal.confirmText'),
},
...(canUseCustomAgent
? [
{
animation: LottieAnimations.CustomAgents,
title: customAgentPromoTitle,
subtitle: translate('aiFeaturesPromoModal.subtitle'),
description: translate('aiFeaturesPromoModal.customAgents.description'),
confirmText: translate('aiFeaturesPromoModal.confirmText'),
},
]
: []),
];

const dismissNVP = (isDismissedUsingCloseButton: boolean) => {
dismissProductTraining(CONST.AI_FEATURES_PROMO_MODAL, isDismissedUsingCloseButton);
};
Expand All @@ -80,26 +50,81 @@ function AIFeaturesPromoModal() {
dismissNVP(true);
};

const illustrationAspectRatio = LottieAnimations.SpendAnalysis.w / LottieAnimations.SpendAnalysis.h;
const subtitle = translate('aiFeaturesPromoModal.subtitle');

return (
<CenteredModalLayout
onBackdropPress={closeModal}
width={variables.aiFeaturesPromoModalWidth}
contentStyle={styles.pt0}
>
<FeatureTrainingCarousel
pages={pages}
<FeatureTraining.Carousel
onConfirm={confirmAndCloseModal}
onClose={closeModal}
Comment thread
gijoe0295 marked this conversation as resolved.
Resolved
width={variables.aiFeaturesPromoModalWidth}
shouldRenderHTMLDescription
shouldUseScrollView
illustrationOuterContainerStyle={styles.p0}
illustrationAspectRatio={LottieAnimations.SpendAnalysis.w / LottieAnimations.SpendAnalysis.h}
contentInnerContainerStyles={styles.mb4}
titleStyles={styles.mb2}
confirmSentryLabel={CONST.SENTRY_LABEL.AI_FEATURES_PROMO_MODAL.CONFIRM_BUTTON}
helpSentryLabel={CONST.SENTRY_LABEL.AI_FEATURES_PROMO_MODAL.HELP_BUTTON}
/>
shouldUseScrollView
>
<FeatureTraining.Page>
<FeatureTraining.Illustration
animation={LottieAnimations.SpendAnalysis}
outerContainerStyle={styles.p0}
aspectRatio={illustrationAspectRatio}
/>
<FeatureTraining.Body>
<FeatureTraining.BodyText style={styles.mb4}>
<FeatureTraining.Subtitle>{subtitle}</FeatureTraining.Subtitle>
<FeatureTraining.Title style={styles.mb2}>{translate('aiFeaturesPromoModal.spendAnalysis.title')}</FeatureTraining.Title>
<FeatureTraining.Description shouldRenderHTML>{translate('aiFeaturesPromoModal.spendAnalysis.description')}</FeatureTraining.Description>
</FeatureTraining.BodyText>
<FeatureTraining.ButtonRow>
<FeatureTraining.BackButton style={styles.flex1} />
<FeatureTraining.ConfirmButton style={styles.flex1}>{translate('common.next')}</FeatureTraining.ConfirmButton>
</FeatureTraining.ButtonRow>
</FeatureTraining.Body>
</FeatureTraining.Page>
<FeatureTraining.Page>
<FeatureTraining.Illustration
animation={LottieAnimations.ExpenseAssistant}
outerContainerStyle={styles.p0}
aspectRatio={illustrationAspectRatio}
/>
<FeatureTraining.Body>
<FeatureTraining.BodyText style={styles.mb4}>
<FeatureTraining.Subtitle>{subtitle}</FeatureTraining.Subtitle>
<FeatureTraining.Title style={styles.mb2}>{translate('aiFeaturesPromoModal.expenseAssistant.title')}</FeatureTraining.Title>
<FeatureTraining.Description shouldRenderHTML>{translate('aiFeaturesPromoModal.expenseAssistant.description')}</FeatureTraining.Description>
</FeatureTraining.BodyText>
<FeatureTraining.ButtonRow>
<FeatureTraining.BackButton style={styles.flex1} />
<FeatureTraining.ConfirmButton style={styles.flex1}>
{canUseCustomAgent ? translate('common.next') : translate('aiFeaturesPromoModal.confirmText')}
</FeatureTraining.ConfirmButton>
</FeatureTraining.ButtonRow>
</FeatureTraining.Body>
</FeatureTraining.Page>
{canUseCustomAgent && (
<FeatureTraining.Page>
<FeatureTraining.Illustration
animation={LottieAnimations.CustomAgents}
outerContainerStyle={styles.p0}
aspectRatio={illustrationAspectRatio}
/>
<FeatureTraining.Body>
<FeatureTraining.BodyText style={styles.mb4}>
<FeatureTraining.Subtitle>{subtitle}</FeatureTraining.Subtitle>
<FeatureTraining.Title>{customAgentPromoTitle}</FeatureTraining.Title>
<FeatureTraining.Description shouldRenderHTML>{translate('aiFeaturesPromoModal.customAgents.description')}</FeatureTraining.Description>
</FeatureTraining.BodyText>
<FeatureTraining.ButtonRow>
<FeatureTraining.BackButton style={styles.flex1} />
<FeatureTraining.ConfirmButton style={styles.flex1}>{translate('aiFeaturesPromoModal.confirmText')}</FeatureTraining.ConfirmButton>
</FeatureTraining.ButtonRow>
</FeatureTraining.Body>
</FeatureTraining.Page>
)}
</FeatureTraining.Carousel>
</CenteredModalLayout>
);
}
Expand Down
76 changes: 41 additions & 35 deletions src/components/AutoSubmitModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import React, {useMemo, useRef} from 'react';
import {View} from 'react-native';

import CenteredModalLayout from './CenteredModalLayout';
import FeatureTrainingContent from './FeatureTrainingContent';
import FeatureTraining from './FeatureTraining';
import Icon from './Icon';
import Text from './Text';

Expand Down Expand Up @@ -57,7 +57,6 @@ function AutoSubmitModal() {
const shouldDismiss = !willShowAgainRef.current;
willShowAgainRef.current = null;

// Defer the Onyx write until after the close transition finishes. This prevents potential checkbox flicker.
TransitionTracker.runAfterTransitions({
callback: () => dismissASAPSubmitExplanation(shouldDismiss),
waitForUpcomingTransition: true,
Expand All @@ -70,51 +69,58 @@ function AutoSubmitModal() {

const onConfirm = (willShowAgain: boolean) => {
willShowAgainRef.current = willShowAgain;
handleClose();
};

const shouldShowDismissOption = dismissedASAPSubmitExplanation === false;

return (
<CenteredModalLayout
onBackdropPress={handleClose}
width={variables.holdEducationModalWidth}
contentStyle={[styles.pt0, styles.pb0]}
>
<FeatureTrainingContent
title={translate('autoSubmitModal.title')}
description={translate('autoSubmitModal.description')}
confirmText={translate('common.buttonConfirm')}
image={illustrations.ReceiptsStackedOnPin}
contentFitImage="cover"
width={variables.holdEducationModalWidth}
imageWidth={variables.changePolicyEducationModalIconWidth}
imageHeight={variables.changePolicyEducationModalIconHeight}
illustrationAspectRatio={CONST.ILLUSTRATION_ASPECT_RATIO}
illustrationInnerContainerStyle={[styles.alignItemsCenter, styles.justifyContentCenter, StyleUtils.getBackgroundColorStyle(colors.green700), styles.p8]}
illustrationOuterContainerStyle={styles.p0}
shouldShowDismissModalOption={dismissedASAPSubmitExplanation === false}
<FeatureTraining
onConfirm={onConfirm}
onClose={handleClose}
titleStyles={[styles.mb1]}
contentInnerContainerStyles={[styles.mb5]}
width={variables.holdEducationModalWidth}
shouldUseScrollView
>
{menuSections.map((section) => (
<View
key={section.titleTranslationKey}
style={[styles.flexRow, styles.alignItemsCenter, styles.mt3]}
>
<Icon
width={variables.menuIconSize}
height={variables.menuIconSize}
src={section.icon}
additionalStyles={[styles.mr4]}
/>
<View style={[styles.flex1, styles.justifyContentCenter]}>
<Text style={[styles.textStrong, styles.mb1]}>{translate(section.titleTranslationKey as TranslationPaths)}</Text>
<Text style={[styles.mutedTextLabel, styles.lh16]}>{translate(section.descriptionTranslationKey as TranslationPaths)}</Text>
</View>
</View>
))}
</FeatureTrainingContent>
<FeatureTraining.Illustration
image={illustrations.ReceiptsStackedOnPin}
contentFitImage="cover"
imageWidth={variables.changePolicyEducationModalIconWidth}
imageHeight={variables.changePolicyEducationModalIconHeight}
aspectRatio={CONST.ILLUSTRATION_ASPECT_RATIO}
innerContainerStyle={[styles.alignItemsCenter, styles.justifyContentCenter, StyleUtils.getBackgroundColorStyle(colors.green700), styles.p8]}
outerContainerStyle={styles.p0}
/>
<FeatureTraining.Body>
<FeatureTraining.BodyText style={styles.mb5}>
<FeatureTraining.Title style={styles.mb1}>{translate('autoSubmitModal.title')}</FeatureTraining.Title>
<FeatureTraining.Description>{translate('autoSubmitModal.description')}</FeatureTraining.Description>
{menuSections.map((section) => (
<View
key={section.titleTranslationKey}
style={[styles.flexRow, styles.alignItemsCenter, styles.mt3]}
>
<Icon
width={variables.menuIconSize}
height={variables.menuIconSize}
src={section.icon}
additionalStyles={[styles.mr4]}
/>
<View style={[styles.flex1, styles.justifyContentCenter]}>
<Text style={[styles.textStrong, styles.mb1]}>{translate(section.titleTranslationKey as TranslationPaths)}</Text>
<Text style={[styles.mutedTextLabel, styles.lh16]}>{translate(section.descriptionTranslationKey as TranslationPaths)}</Text>
</View>
</View>
))}
</FeatureTraining.BodyText>
{shouldShowDismissOption && <FeatureTraining.DismissOption />}
<FeatureTraining.ConfirmButton>{translate('common.buttonConfirm')}</FeatureTraining.ConfirmButton>
</FeatureTraining.Body>
</FeatureTraining>
</CenteredModalLayout>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/CenteredModalLayout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type CenteredModalLayoutProps = {

/**
* Whether the content wrapper should apply the bottom safe-area inset. Disable it when the children
* already handle the inset themselves (e.g. FeatureTrainingContent with `shouldUseScrollView`, whose
* already handle the inset themselves (e.g. FeatureTraining with `shouldUseScrollView`, whose
* ScrollView content padding includes it), otherwise the inset is applied twice and renders as an
* empty band under the content on devices with a bottom inset.
*/
Expand Down
71 changes: 71 additions & 0 deletions src/components/FeatureTraining/FeatureTraining.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import variables from '@styles/variables';

import React, {useCallback, useMemo, useState} from 'react';

import type {FeatureTrainingActionsValue, FeatureTrainingStateValue} from './context';
import type {FeatureTrainingProps} from './types';

import {FeatureTrainingActionsContext, FeatureTrainingStateContext} from './context';
import useScrollableWrapper from './hooks/useScrollableWrapper';

function FeatureTraining({
onConfirm,
onClose,
onWillShowAgainChange,
shouldUseScrollView = false,
width = variables.featureTrainingModalWidth,
confirmSentryLabel,
children,
}: FeatureTrainingProps) {
const [willShowAgain, setWillShowAgain] = useState(true);
const {Wrapper, wrapperProps} = useScrollableWrapper({shouldUseScrollView, width});

const toggleWillShowAgain = useCallback(() => {
onWillShowAgainChange?.(!willShowAgain);
setWillShowAgain((prev) => !prev);
}, [onWillShowAgainChange, willShowAgain]);

// Closing after confirm is the consumer's responsibility — call it inside onConfirm when desired.
const handleConfirm = useCallback(() => {
onConfirm?.(willShowAgain);
}, [onConfirm, willShowAgain]);

const handleClose = useCallback(() => onClose?.(), [onClose]);

const stateValue = useMemo<FeatureTrainingStateValue>(
() => ({
willShowAgain,
shouldShowLoadingImmediatelyOnPress: undefined,
isCarousel: false,
confirmSentryLabel,
currentPage: undefined,
pageCount: undefined,
isLastPage: undefined,
contentMinHeight: undefined,
}),
[willShowAgain, confirmSentryLabel],
);

const actionsValue = useMemo<FeatureTrainingActionsValue>(
() => ({
toggleWillShowAgain,
handleConfirm,
handleClose,
advance: undefined,
goBack: undefined,
}),
[toggleWillShowAgain, handleConfirm, handleClose],
);

return (
<FeatureTrainingStateContext.Provider value={stateValue}>
<FeatureTrainingActionsContext.Provider value={actionsValue}>
<Wrapper {...wrapperProps}>{children}</Wrapper>
</FeatureTrainingActionsContext.Provider>
</FeatureTrainingStateContext.Provider>
);
}

FeatureTraining.displayName = 'FeatureTraining';

export default FeatureTraining;
Loading
Loading