Skip to content

Commit 6c3a5b7

Browse files
inimagainimaga
committed
Merge remote-tracking branch 'origin/main' into issa/add-concierge-draft-streaming
# Conflicts: # src/CONST/index.ts # src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx # src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx # src/components/Search/SearchList/ListItem/TransactionListItem.tsx # src/languages/de.ts # src/languages/en.ts # src/languages/es.ts # src/languages/fr.ts # src/languages/it.ts # src/languages/ja.ts # src/languages/nl.ts # src/languages/pl.ts # src/languages/pt-BR.ts # src/languages/zh-hans.ts # src/libs/actions/App.ts # src/libs/actions/Delegate.ts # src/libs/actions/IOU/TrackExpense.ts # src/pages/Search/SearchMoneyRequestReportPage.tsx # src/pages/domain/Groups/DomainGroupDetailsPage.tsx # src/pages/inbox/ConciergeDraftContext.tsx # src/pages/inbox/ReportScreen.tsx # src/pages/inbox/conciergeDraftState.ts # src/pages/inbox/report/ReportActionsList.tsx # src/pages/inbox/report/ReportActionsListHeader.tsx # src/pages/iou/request/step/IOURequestStepAccountant.tsx # src/pages/iou/request/step/IOURequestStepDistanceManual.tsx # src/pages/iou/request/step/confirmation/SubmitExpenseOrchestrator.tsx # src/types/onyx/DomainErrors.ts # src/types/onyx/DomainPendingActions.ts # tests/actions/DelegateTest.ts # tests/actions/PolicyTest.ts # tests/ui/PureReportActionItemTest.tsx # tests/unit/pages/inbox/conciergeDraftState.test.ts
2 parents 60a1baa + f824da8 commit 6c3a5b7

131 files changed

Lines changed: 3735 additions & 816 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/images/bank-lock.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎config/eslint/eslint.seatbelt.tsv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
"../../src/libs/actions/Policy/PerDiem.ts" "no-restricted-syntax" 1
279279
"../../src/libs/actions/Policy/Plan.ts" "no-restricted-syntax" 1
280280
"../../src/libs/actions/Policy/Policy.ts" "no-restricted-syntax" 10
281-
"../../src/libs/actions/Policy/Policy.ts" "rulesdir/no-onyx-connect" 4
281+
"../../src/libs/actions/Policy/Policy.ts" "rulesdir/no-onyx-connect" 3
282282
"../../src/libs/actions/Policy/ReportField.ts" "no-restricted-syntax" 4
283283
"../../src/libs/actions/Policy/Rules.ts" "no-restricted-syntax" 3
284284
"../../src/libs/actions/Policy/Tag.ts" "no-restricted-syntax" 4

‎cspell.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
"Dishoom",
192192
"displaystatus",
193193
"DocuSign",
194+
"domelementtype",
194195
"domhandler",
195196
"domparser",
196197
"dont",

‎src/CONST/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7645,6 +7645,7 @@ const CONST = {
76457645
AMOUNT: this.TABLE_COLUMNS.TOTAL_AMOUNT,
76467646
EXPORTED_TO: this.TABLE_COLUMNS.EXPORTED_TO,
76477647
ACTION: this.TABLE_COLUMNS.ACTION,
7648+
WITHDRAWAL_ID: this.TABLE_COLUMNS.WITHDRAWAL_ID,
76487649
},
76497650
EXPENSE_REPORT: {
76507651
DATE: this.TABLE_COLUMNS.DATE,
@@ -7686,6 +7687,7 @@ const CONST = {
76867687
TAX_AMOUNT: this.TABLE_COLUMNS.TAX_AMOUNT,
76877688
AMOUNT: this.TABLE_COLUMNS.TOTAL_AMOUNT,
76887689
TOTAL: this.TABLE_COLUMNS.TOTAL,
7690+
WITHDRAWAL_ID: this.TABLE_COLUMNS.WITHDRAWAL_ID,
76897691
};
76907692
},
76917693
get GROUP_CUSTOM_COLUMNS() {

‎src/components/BaseVacationDelegateSelectionComponent.tsx‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import CONST from '@src/CONST';
1313
import ONYXKEYS from '@src/ONYXKEYS';
1414
import type {Participant} from '@src/types/onyx/IOU';
1515
import type {BaseVacationDelegate} from '@src/types/onyx/VacationDelegate';
16+
import FullPageOfflineBlockingView from './BlockingViews/FullPageOfflineBlockingView';
1617
import DelegatorList from './DelegatorList';
1718
import HeaderWithBackButton from './HeaderWithBackButton';
1819
import UserListItem from './SelectionList/ListItem/UserListItem';
@@ -163,33 +164,35 @@ function BaseVacationDelegateSelectionComponent({
163164
title={headerTitle}
164165
onBackButtonPress={onBackButtonPress}
165166
/>
166-
{hasActiveDelegations ? (
167-
<View style={styles.mt6}>
168-
<DelegatorList
169-
delegators={vacationDelegate?.delegatorFor}
170-
message={cannotSetDelegateMessage}
171-
/>
172-
</View>
173-
) : (
174-
<View style={[styles.flex1, styles.w100, styles.pRelative]}>
175-
<SelectionList
176-
sections={areOptionsInitialized ? sections : []}
177-
ListItem={UserListItem}
178-
onSelectRow={(item) => {
179-
// Clear search to prevent "No results found" after selection
180-
setSearchTerm('');
181-
182-
onSelectRow(item);
183-
}}
184-
textInputOptions={textInputOptions}
185-
shouldShowLoadingPlaceholder={!areOptionsInitialized}
186-
isLoadingNewOptions={!!isSearchingForReports}
187-
onEndReached={onListEndReached}
188-
shouldSingleExecuteRowSelect
189-
shouldShowTextInput
190-
/>
191-
</View>
192-
)}
167+
<FullPageOfflineBlockingView>
168+
{hasActiveDelegations ? (
169+
<View style={styles.mt6}>
170+
<DelegatorList
171+
delegators={vacationDelegate?.delegatorFor}
172+
message={cannotSetDelegateMessage}
173+
/>
174+
</View>
175+
) : (
176+
<View style={[styles.flex1, styles.w100, styles.pRelative]}>
177+
<SelectionList
178+
sections={areOptionsInitialized ? sections : []}
179+
ListItem={UserListItem}
180+
onSelectRow={(item) => {
181+
// Clear search to prevent "No results found" after selection
182+
setSearchTerm('');
183+
184+
onSelectRow(item);
185+
}}
186+
textInputOptions={textInputOptions}
187+
shouldShowLoadingPlaceholder={!areOptionsInitialized}
188+
isLoadingNewOptions={!!isSearchingForReports}
189+
onEndReached={onListEndReached}
190+
shouldSingleExecuteRowSelect
191+
shouldShowTextInput
192+
/>
193+
</View>
194+
)}
195+
</FullPageOfflineBlockingView>
193196
</>
194197
);
195198
}

‎src/components/Icon/chunks/expensify-icons.chunk.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import FallbackWorkspaceAvatar from '@assets/images/avatars/fallback-workspace-a
1919
import NotificationsAvatar from '@assets/images/avatars/notifications-avatar.svg';
2020
import ActiveRoomAvatar from '@assets/images/avatars/room.svg';
2121
import BackArrow from '@assets/images/back-left.svg';
22+
import BankLock from '@assets/images/bank-lock.svg';
2223
import Bank from '@assets/images/bank.svg';
2324
import Basket from '@assets/images/basket.svg';
2425
import BedCircleSlash from '@assets/images/bed-circle-slash.svg';
@@ -278,6 +279,7 @@ const Expensicons = {
278279
AttachmentNotFound,
279280
BackArrow,
280281
Bank,
282+
BankLock,
281283
Basket,
282284
CircularArrowBackwards,
283285
Bill,

‎src/components/MoneyRequestHeaderSecondaryActions.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
135135
const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION);
136136
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
137137
const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
138-
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
139138
const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
140139
const [shouldFailAllRequests] = useOnyx(ONYXKEYS.NETWORK, {selector: shouldFailAllRequestsSelector});
141140
const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
@@ -221,7 +220,6 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
221220
optimisticIOUReportID,
222221
isASAPSubmitBetaEnabled,
223222
introSelected,
224-
activePolicyID,
225223
quickAction,
226224
policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [],
227225
isSelfTourViewed,

‎src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function MoneyRequestReportTransactionItem({
151151
}}
152152
disabled={isTransactionPendingDelete(transaction)}
153153
ref={viewRef}
154-
wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && styles.borderBottom]}
154+
wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && !isLastItem && StyleUtils.getSelectedBorderBottomStyle(isSelected)]}
155155
>
156156
{({hovered}) => (
157157
<TransactionItemRow

‎src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,8 @@ function MoneyRequestReportTransactionList({
655655
!isDesktopTableLayout && styles.pl5,
656656
isDesktopTableLayout ? styles.pr11 : styles.pr16,
657657
styles.alignItemsCenter,
658-
isDesktopTableLayout && [styles.highlightBG, styles.searchTableTopRadius, styles.mh5, styles.borderBottom],
658+
isDesktopTableLayout && [styles.highlightBG, styles.searchTableTopRadius, styles.mh5],
659+
StyleUtils.getSelectedBorderBottomStyle(selectedTransactionIDs.length > 0),
659660
]}
660661
>
661662
<View

‎src/components/Search/SearchInputSelectionWrapper/index.native.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function SearchInputSelectionWrapper({ref, skipSkeleton, ...props}: SearchAutoco
3030
return (
3131
<SearchAutocompleteInput
3232
ref={ref}
33-
// eslint-disable-next-line react/jsx-props-no-spreading
33+
// eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding all props to SearchAutocompleteInput
3434
{...props}
3535
selection={undefined}
3636
/>

0 commit comments

Comments
 (0)