[Test Drive Expensify: Phase 2] Front end changes #60997
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,11 +18,15 @@ import CONST from '@src/CONST'; | |
| import type IconAsset from '@src/types/utils/IconAsset'; | ||
| import Button from './Button'; | ||
| import CheckboxWithLabel from './CheckboxWithLabel'; | ||
| import FormAlertWithSubmitButton from './FormAlertWithSubmitButton'; | ||
| import ImageSVG from './ImageSVG'; | ||
| import Lottie from './Lottie'; | ||
| import LottieAnimations from './LottieAnimations'; | ||
| import type DotLottieAnimation from './LottieAnimations/types'; | ||
| import Modal from './Modal'; | ||
| import OfflineIndicator from './OfflineIndicator'; | ||
| import RenderHTML from './RenderHTML'; | ||
| import ScrollView from './ScrollView'; | ||
| import Text from './Text'; | ||
| import VideoPlayer from './VideoPlayer'; | ||
|
|
||
|
|
@@ -98,6 +102,24 @@ type BaseFeatureTrainingModalProps = { | |
|
|
||
| /** Whether the modal image is a SVG */ | ||
| shouldRenderSVG?: boolean; | ||
|
|
||
| /** Whether the modal description is written in HTML */ | ||
| shouldRenderHTMLDescription?: boolean; | ||
|
|
||
| /** Whether the modal will be closed on confirm */ | ||
| shouldCloseOnConfirm?: boolean; | ||
|
|
||
| /** Whether the modal should avoid the keyboard */ | ||
| avoidKeyboard?: boolean; | ||
|
|
||
| /** Whether the modal content is scrollable */ | ||
| shouldUseScrollView?: boolean; | ||
|
|
||
| /** Whether the modal is displaying a confirmation loading spinner (useful when fetching data from API during confirmation) */ | ||
| shouldShowConfirmationLoader?: boolean; | ||
|
|
||
| /** Whether the user can confirm the tutorial while offline */ | ||
| canConfirmWhileOffline?: boolean; | ||
| }; | ||
|
|
||
| type FeatureTrainingModalVideoProps = { | ||
|
|
@@ -155,6 +177,12 @@ function FeatureTrainingModal({ | |
| imageHeight, | ||
| isModalDisabled = true, | ||
| shouldRenderSVG = true, | ||
| shouldRenderHTMLDescription = false, | ||
| shouldCloseOnConfirm = true, | ||
| avoidKeyboard = false, | ||
| shouldUseScrollView = false, | ||
| shouldShowConfirmationLoader = false, | ||
| canConfirmWhileOffline = true, | ||
| }: FeatureTrainingModalProps) { | ||
| const styles = useThemeStyles(); | ||
| const StyleUtils = useStyleUtils(); | ||
|
|
@@ -297,9 +325,11 @@ function FeatureTrainingModal({ | |
| }, [onClose, willShowAgain]); | ||
|
|
||
| const closeAndConfirmModal = useCallback(() => { | ||
| if (shouldCloseOnConfirm) { | ||
| closeModal(); | ||
| } | ||
| onConfirm?.(); | ||
| }, [shouldCloseOnConfirm, onConfirm, closeModal]); | ||
|
|
||
| /** | ||
| * Extracts values from the non-scraped attribute WEB_PROP_ATTR at build time | ||
|
|
@@ -309,14 +339,17 @@ function FeatureTrainingModal({ | |
| */ | ||
| useLayoutEffect(parseFSAttributes, []); | ||
|
|
||
| const Wrapper = shouldUseScrollView ? ScrollView : View; | ||
|
|
||
| return ( | ||
| <Modal | ||
| avoidKeyboard={avoidKeyboard} | ||
| isVisible={isModalVisible} | ||
| type={onboardingIsMediumOrLargerScreenWidth ? CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED} | ||
| onClose={closeModal} | ||
| innerContainerStyle={{ | ||
| boxShadow: 'none', | ||
| ...(shouldUseScrollView ? styles.pb0 : styles.pb5), | ||
| paddingTop: onboardingIsMediumOrLargerScreenWidth ? undefined : MODAL_PADDING, | ||
| ...(onboardingIsMediumOrLargerScreenWidth | ||
| ? // Override styles defined by MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE | ||
|
|
@@ -329,8 +362,9 @@ function FeatureTrainingModal({ | |
| ...modalInnerContainerStyle, | ||
| }} | ||
| > | ||
| <Wrapper | ||
| style={[styles.mh100, onboardingIsMediumOrLargerScreenWidth && StyleUtils.getWidthStyle(width)]} | ||
| contentContainerStyle={shouldUseScrollView ? styles.pb5 : undefined} | ||
| fsClass={CONST.FULL_STORY.UNMASK} | ||
| testID={CONST.FULL_STORY.UNMASK} | ||
| > | ||
|
|
@@ -341,7 +375,13 @@ function FeatureTrainingModal({ | |
| {!!title && !!description && ( | ||
| <View style={[onboardingIsMediumOrLargerScreenWidth ? [styles.gap1, styles.mb8] : [styles.mb10], contentInnerContainerStyles]}> | ||
| {typeof title === 'string' ? <Text style={[styles.textHeadlineH1]}>{title}</Text> : title} | ||
| {shouldRenderHTMLDescription ? ( | ||
| <Text> | ||
| <RenderHTML html={description} /> | ||
| </Text> | ||
|
Comment on lines
+379
to
+381
Contributor
There was a problem hiding this comment. Coming from #63274 , we shouldn’t wrap
Contributor
Author
|
||
| ) : ( | ||
| <Text style={styles.textSupporting}>{description}</Text> | ||
| )} | ||
| {secondaryDescription.length > 0 && <Text style={[styles.textSupporting, styles.mt4]}>{secondaryDescription}</Text>} | ||
| {children} | ||
| </View> | ||
|
|
@@ -363,17 +403,19 @@ function FeatureTrainingModal({ | |
| text={helpText} | ||
| /> | ||
| )} | ||
| <FormAlertWithSubmitButton | ||
| onSubmit={closeAndConfirmModal} | ||
| isLoading={shouldShowConfirmationLoader} | ||
| buttonText={confirmText} | ||
| enabledWhenOffline={canConfirmWhileOffline} | ||
| /> | ||
| {!canConfirmWhileOffline && <OfflineIndicator />} | ||
| </View> | ||
| </Wrapper> | ||
| </Modal> | ||
| ); | ||
| } | ||
|
|
||
| export default FeatureTrainingModal; | ||
|
|
||
| export type {FeatureTrainingModalProps}; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import React from 'react'; | ||
| import {InteractionManager} from 'react-native'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import BaseTestDriveModal from './BaseTestDriveModal'; | ||
|
|
||
| function AdminTestDriveModal() { | ||
| const {translate} = useLocalize(); | ||
|
|
||
| const navigate = () => { | ||
| InteractionManager.runAfterInteractions(() => { | ||
| Navigation.navigate(ROUTES.TEST_DRIVE_DEMO_ROOT); | ||
| }); | ||
| }; | ||
|
|
||
| return ( | ||
| <BaseTestDriveModal | ||
| description={translate('testDrive.modal.description')} | ||
| onConfirm={navigate} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| AdminTestDriveModal.displayName = 'AdminTestDriveModal'; | ||
|
|
||
| export default AdminTestDriveModal; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a difference in View and ScrollView. In ScrollView there is an extra space that kinda hides the submit button, can we remove it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@s77rt this is what I get with the current changes:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I'm referring to that extra space above the keyboard. Can it be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is coming from the 20px bottom padding that is passed to the modal in
innerContainerStyle. I think we would need to keep the currentViewand add another wrapper that could be eitherScrollVieworFragment. This is needed because we have to satisfy two conditions:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have not tested this well but what I found working is the following:
Wrapperto beScrollVieworFragmentand wrap the whole existingViewUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@s77rt I tried these changes and they seem to do the trick:
Results:
442856461-da088978-99ad-4f32-8d25-cff102d804e3.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! Let's go with that but please confirm that this does not generate errors as we are passing
contentContainerStyleto aWrapperthat could be aViewwhich does not support this prop.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@s77rt I didn't see any console log with my changes, so it should be safe 😄
P.S: I added a condition so
contentContainerStyleis undefined whenshouldUseScrollViewis false