feat(26270): Add Skeleton UI for Money Requests #26613
There are no files selected for viewing
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,40 @@ | ||
| import React from 'react'; | ||
| import {Rect} from 'react-native-svg'; | ||
| import SkeletonViewContentLoader from 'react-content-loader/native'; | ||
| import variables from '../styles/variables'; | ||
| import themeColors from '../styles/themes/default'; | ||
| import styles from '../styles/styles'; | ||
|
|
||
| function MoneyRequestSkeletonView() { | ||
| return ( | ||
| <SkeletonViewContentLoader | ||
| animate | ||
| width={styles.w100.width} | ||
| height={variables.moneyRequestSkeletonHeight} | ||
| backgroundColor={themeColors.borderLighter} | ||
| foregroundColor={themeColors.border} | ||
| > | ||
| <Rect | ||
| x="16" | ||
| y="20" | ||
| width="40" | ||
| height="8" | ||
| /> | ||
| <Rect | ||
| x="16" | ||
| y="46" | ||
| width="120" | ||
| height="20" | ||
| /> | ||
| <Rect | ||
| x="16" | ||
| y="78" | ||
| width="80" | ||
| height="8" | ||
| /> | ||
| </SkeletonViewContentLoader> | ||
| ); | ||
| } | ||
|
|
||
| MoneyRequestSkeletonView.displayName = 'MoneyRequestSkeletonView'; | ||
| export default MoneyRequestSkeletonView; |
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 |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ import * as ReceiptUtils from '../../libs/ReceiptUtils'; | |
| import ReportActionItemImages from './ReportActionItemImages'; | ||
| import transactionPropTypes from '../transactionPropTypes'; | ||
| import colors from '../../styles/colors'; | ||
| import MoneyRequestSkeletonView from '../MoneyRequestSkeletonView'; | ||
|
|
||
| const propTypes = { | ||
| /** The active IOUReport, used for Onyx subscription */ | ||
|
|
@@ -234,77 +235,81 @@ function MoneyRequestPreview(props) { | |
| isHovered={isScanning} | ||
| /> | ||
| )} | ||
| {_.isEmpty(props.transaction) ? ( | ||
|
Contributor
There was a problem hiding this comment. This caused regression of showing skeleton forever when delete money request offline - #26939 |
||
| <MoneyRequestSkeletonView /> | ||
| ) : ( | ||
| <View style={styles.moneyRequestPreviewBoxText}> | ||
| <View style={[styles.flexRow]}> | ||
| <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}> | ||
| <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getPreviewHeaderText()}</Text> | ||
| {Boolean(getSettledMessage()) && ( | ||
| <> | ||
| <Icon | ||
| src={Expensicons.DotIndicator} | ||
| width={4} | ||
| height={4} | ||
| additionalStyles={[styles.mr1, styles.ml1]} | ||
|
Member
There was a problem hiding this comment. Coming from Dot separator in the report preview component appears bottom aligned
|
||
| /> | ||
| <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getSettledMessage()}</Text> | ||
| </> | ||
| )} | ||
| </View> | ||
| {hasFieldErrors && ( | ||
| <Icon | ||
| src={Expensicons.DotIndicator} | ||
| fill={colors.red} | ||
| /> | ||
| )} | ||
| </View> | ||
| <View style={[styles.flexRow]}> | ||
| <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}> | ||
| <Text style={styles.textHeadline}>{getDisplayAmountText()}</Text> | ||
| {ReportUtils.isSettled(props.iouReport.reportID) && !props.isBillSplit && ( | ||
| <View style={styles.defaultCheckmarkWrapper}> | ||
| <Icon | ||
| src={Expensicons.Checkmark} | ||
| fill={themeColors.iconSuccessFill} | ||
| /> | ||
| </View> | ||
| )} | ||
| </View> | ||
| {props.isBillSplit && ( | ||
| <View style={styles.moneyRequestPreviewBoxAvatar}> | ||
| <MultipleAvatars | ||
| icons={participantAvatars} | ||
| shouldStackHorizontally | ||
| size="small" | ||
| isHovered={props.isHovered} | ||
| shouldUseCardBackground | ||
| /> | ||
| </View> | ||
| )} | ||
| </View> | ||
| {shouldShowMerchant && ( | ||
| <View style={[styles.flexRow]}> | ||
| <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20, styles.breakWord]}>{requestMerchant}</Text> | ||
| </View> | ||
| )} | ||
| <View style={[styles.flexRow]}> | ||
| <View style={[styles.flex1]}> | ||
| {!isCurrentUserManager && props.shouldShowPendingConversionMessage && ( | ||
| <Text style={[styles.textLabel, styles.colorMuted, styles.mt1]}>{props.translate('iou.pendingConversionMessage')}</Text> | ||
| )} | ||
| {shouldShowDescription && <Text style={[styles.mt1, styles.colorMuted]}>{description}</Text>} | ||
| </View> | ||
| {props.isBillSplit && !_.isEmpty(participantAccountIDs) && ( | ||
| <Text style={[styles.textLabel, styles.colorMuted, styles.ml1]}> | ||
| {props.translate('iou.amountEach', { | ||
| amount: CurrencyUtils.convertToDisplayString( | ||
| IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency), | ||
| requestCurrency, | ||
| ), | ||
| })} | ||
| </Text> | ||
| )} | ||
| </View> | ||
| </View> | ||
| )} | ||
| </View> | ||
| </OfflineWithFeedback> | ||
| </View> | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.