Skip to content

[CP Staging] fix try it out button #60777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amyevans merged 8 commits into from
Apr 25, 2025
Merged

[CP Staging] fix try it out button #60777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f323fef
fix try it out button
nkdengineer Apr 24, 2025
6e46367
fix lint
nkdengineer Apr 24, 2025
e7f62fe
Update src/libs/actions/IOU.ts
nkdengineer Apr 24, 2025
911044c
Update src/libs/actions/IOU.ts
nkdengineer Apr 24, 2025
a28bb28
Merge branch 'main' into fix/60736
nkdengineer Apr 25, 2025
f05f247
updated correct transaction reportID
nkdengineer Apr 25, 2025
a1691e6
fix canBeMissing
nkdengineer Apr 25, 2025
9236ed2
fix lint
nkdengineer Apr 25, 2025
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
9 changes: 7 additions & 2 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,8 +944,13 @@ function setMoneyRequestBillable(transactionID: string, billable: boolean) {
Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {billable});
}

function setMoneyRequestParticipants(transactionID: string, participants: Participant[] = [], shouldUpdateReportID = false) {
return Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {participants, reportID: shouldUpdateReportID ? participants.at(0)?.reportID : undefined});
function setMoneyRequestParticipants(transactionID: string, participants: Participant[] = [], isTestTransaction = false) {
// We should change the reportID and isFromGlobalCreate of the test transaction since this flow can start inside an existing report
return Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {
participants,
isFromGlobalCreate: isTestTransaction ? true : undefined,
reportID: isTestTransaction ? participants?.at(0)?.reportID : undefined,
});
}

function setSplitPayer(transactionID: string, payerAccountID: number) {
Expand Down
18 changes: 10 additions & 8 deletions src/pages/iou/request/IOURequestStartPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import TabSelector from '@components/TabSelector/TabSelector';
import useLocalize from '@hooks/useLocalize';
import usePolicy from '@hooks/usePolicy';
import usePrevious from '@hooks/usePrevious';
import useThemeStyles from '@hooks/useThemeStyles';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -44,14 +45,13 @@ function IOURequestStartPage({
const {translate} = useLocalize();
const shouldUseTab = iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.PAY && iouType !== CONST.IOU.TYPE.INVOICE;
const [isDraggingOver, setIsDraggingOver] = useState(false);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: true});
const policy = usePolicy(report?.policyID);
const [selectedTab = CONST.TAB_REQUEST.SCAN, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.IOU_REQUEST_TYPE}`);
const [session] = useOnyx(ONYXKEYS.SESSION);
const [selectedTab = CONST.TAB_REQUEST.SCAN, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.IOU_REQUEST_TYPE}`, {canBeMissing: true});
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false});
const isLoadingSelectedTab = shouldUseTab ? isLoadingOnyxValue(selectedTabResult) : false;
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID || CONST.DEFAULT_NUMBER_ID}`);
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID}`, {canBeMissing: true});
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false});

const tabTitles = {
[CONST.IOU.TYPE.REQUEST]: translate('iou.createExpense'),
Expand All @@ -68,15 +68,17 @@ function IOURequestStartPage({
[transaction?.iouRequestType, shouldUseTab, selectedTab],
);
const isFromGlobalCreate = isEmptyObject(report?.reportID);
const prevTransactionReportID = usePrevious(transaction?.reportID);

// Clear out the temporary expense if the reportID in the URL has changed from the transaction's reportID.
useFocusEffect(
useCallback(() => {
if (transaction?.reportID === reportID || isLoadingSelectedTab) {
// The test transaction can change the reportID of the transaction on the flow so we should prevent the reportID from being reverted again.
if (transaction?.reportID === reportID || isLoadingSelectedTab || prevTransactionReportID !== transaction?.reportID) {
return;
}
initMoneyRequest(reportID, policy, isFromGlobalCreate, transaction?.iouRequestType, transactionRequestType);
}, [transaction, policy, reportID, isFromGlobalCreate, transactionRequestType, isLoadingSelectedTab]),
}, [transaction, policy, reportID, isFromGlobalCreate, transactionRequestType, isLoadingSelectedTab, prevTransactionReportID]),
);

useEffect(() => {
Expand Down