From 6ab4f2152df19cd59627312803a316e63ff1599a Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Sat, 17 May 2025 02:26:38 +0700 Subject: [PATCH 1/4] fix: mssing Expensify Card issuing statement --- .../WorkspaceExpensifyCardListPage.tsx | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index b0d54b7c604..c0e24d7c8ae 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -15,13 +15,16 @@ import {PressableWithFeedback} from '@components/Pressable'; import ScreenWrapper from '@components/ScreenWrapper'; import ScrollView from '@components/ScrollView'; import SearchBar from '@components/SearchBar'; +import Text from '@components/Text'; import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle'; +import useEmptyViewHeaderHeight from '@hooks/useEmptyViewHeaderHeight'; import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds'; import useLocalize from '@hooks/useLocalize'; import usePolicy from '@hooks/usePolicy'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useSearchResults from '@hooks/useSearchResults'; import useThemeStyles from '@hooks/useThemeStyles'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import {clearDeletePaymentMethodError} from '@libs/actions/PaymentMethods'; import {filterCardsByPersonalDetails, getCardsByCardholderName, sortCardsByCardholderName} from '@libs/CardUtils'; import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -72,6 +75,9 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp const isBankAccountVerified = !cardOnWaitlist; + const {windowHeight} = useWindowDimensions(); + const headerHeight = useEmptyViewHeaderHeight(shouldUseNarrowLayout, isBankAccountVerified); + const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]); const allCards = useMemo(() => { @@ -182,27 +188,30 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp showsVerticalScrollIndicator={false} contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]} > - - - {allCards.length > CONST.SEARCH_ITEM_LIMIT && ( - + + - )} + {allCards.length > CONST.SEARCH_ITEM_LIMIT && ( + + )} + + - + {translate('workspace.expensifyCard.disclaimer')} )} Date: Mon, 2 Jun 2025 13:48:27 +0700 Subject: [PATCH 2/4] fix prettier --- .../WorkspaceExpensifyCardListPage.tsx | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index da7ec389baa..ce2ccd05762 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -1,21 +1,23 @@ import React, {useCallback, useMemo, useState} from 'react'; import type {ListRenderItemInfo} from 'react-native'; -import {FlatList, ScrollView, View} from 'react-native'; +import {FlatList, View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import ExpensifyCardImage from '@assets/images/expensify-card.svg'; import Button from '@components/Button'; import DelegateNoAccessModal from '@components/DelegateNoAccessModal'; import FeedSelector from '@components/FeedSelector'; -import Text from '@components/Text'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import {Gear, Plus} from '@components/Icon/Expensicons'; import {HandCard} from '@components/Icon/Illustrations'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import {PressableWithFeedback} from '@components/Pressable'; import ScreenWrapper from '@components/ScreenWrapper'; +import ScrollView from '@components/ScrollView'; import SearchBar from '@components/SearchBar'; +import Text from '@components/Text'; import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle'; +import useEmptyViewHeaderHeight from '@hooks/useEmptyViewHeaderHeight'; import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds'; import useHandleBackButton from '@hooks/useHandleBackButton'; import useLocalize from '@hooks/useLocalize'; @@ -23,6 +25,7 @@ import usePolicy from '@hooks/usePolicy'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useSearchResults from '@hooks/useSearchResults'; import useThemeStyles from '@hooks/useThemeStyles'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import {clearDeletePaymentMethodError} from '@libs/actions/PaymentMethods'; import {filterCardsByPersonalDetails, getCardsByCardholderName, sortCardsByCardholderName} from '@libs/CardUtils'; import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -35,8 +38,6 @@ import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import type {Card, WorkspaceCardsList} from '@src/types/onyx'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; -import useWindowDimensions from '@hooks/useWindowDimensions'; -import useEmptyViewHeaderHeight from '@hooks/useEmptyViewHeaderHeight'; import EmptyCardView from './EmptyCardView'; import WorkspaceCardListHeader from './WorkspaceCardListHeader'; import WorkspaceCardListLabels from './WorkspaceCardListLabels'; @@ -66,7 +67,6 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${fundID}`, {canBeMissing: false}); const allExpensifyCardFeeds = useExpensifyCardFeeds(policyID); - const shouldShowSelector = Object.keys(allExpensifyCardFeeds ?? {}).length > 1; const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.delegatedAccess?.delegate, canBeMissing: false}); @@ -211,15 +211,15 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp ) : ( - - - - {translate('workspace.expensifyCard.disclaimer')} + + + + {translate('workspace.expensifyCard.disclaimer')} )} Date: Tue, 3 Jun 2025 11:49:33 +0700 Subject: [PATCH 3/4] fix prettier --- .../workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index 81f2f649229..dbd4a22b4ed 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -248,4 +248,4 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp WorkspaceExpensifyCardListPage.displayName = 'WorkspaceExpensifyCardListPage'; -export default WorkspaceExpensifyCardListPage; \ No newline at end of file +export default WorkspaceExpensifyCardListPage; From e3253d3ccfadf157966e6f0469035e32af65ac26 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 4 Jun 2025 15:49:27 +0700 Subject: [PATCH 4/4] add safe padding for scroll view --- .../expensifyCard/WorkspaceExpensifyCardListPage.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx index dbd4a22b4ed..1498e0d45c7 100644 --- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx +++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx @@ -226,7 +226,10 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp {isEmptyObject(cardsList) ? ( ) : ( - +