Skip to content
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

Send app source when chatting with Concierge, after redirection from OldDot #34590

Merged
merged 6 commits into from
Jan 16, 2024
Merged

Send app source when chatting with Concierge, after redirection from OldDot #34590

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23012c7
Verify if the user comes from OldDot
cristipaval Jan 15, 2024
020a22b
Create ReportUtils.isOldDotConciergeChat function
cristipaval Jan 15, 2024
34d6d90
Try a new approach
cristipaval Jan 16, 2024
9eaddcd
Revert initial changes
cristipaval Jan 16, 2024
c71299b
Remove console logs
cristipaval Jan 16, 2024
4524a3e
Run prettier
cristipaval Jan 16, 2024
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
15 changes: 14 additions & 1 deletion src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import Str from 'expensify-common/lib/str';
import isEmpty from 'lodash/isEmpty';
import {DeviceEventEmitter, InteractionManager} from 'react-native';
import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import type {NullishDeep} from 'react-native-onyx/lib/types';
Expand Down Expand Up @@ -127,6 +127,14 @@ const allReports: OnyxCollection<Report> = {};
let conciergeChatReportID: string | undefined;
const typingWatchTimers: Record<string, NodeJS.Timeout> = {};

let reportIDDeeplinkedFromOldDot: string | undefined;
Linking.getInitialURL().then((url) => {
const params = new URLSearchParams(url ?? '');
const exitToRoute = params.get('exitTo') ?? '';
const {reportID} = ReportUtils.parseReportRouteParams(exitToRoute);
reportIDDeeplinkedFromOldDot = reportID;
});
Comment on lines +131 to +136
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wasn't this added in a useEffect with an empty dependency list?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanted to avoid passing this ugly parameter from a component to the Report.addComment and Report.addAttachment functions. Do we have a best practice or a guideline related to this? 👀

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know of any. I guess this is fine as it is then.


/** Get the private pusher channel name for a Report. */
function getReportChannelName(reportID: string): string {
return `${CONST.PUSHER.PRIVATE_REPORT_CHANNEL_PREFIX}${reportID}${CONFIG.PUSHER.SUFFIX}`;
Expand Down Expand Up @@ -343,6 +351,7 @@ function addActions(reportID: string, text = '', file?: File) {
timezone?: string;
shouldAllowActionableMentionWhispers?: boolean;
clientCreatedTime?: string;
isOldDotConciergeChat?: boolean;
};

const parameters: AddCommentOrAttachementParameters = {
Expand All @@ -355,6 +364,10 @@ function addActions(reportID: string, text = '', file?: File) {
clientCreatedTime: file ? attachmentAction?.created : reportCommentAction?.created,
};

if (reportIDDeeplinkedFromOldDot === reportID && report?.participantAccountIDs?.length === 1 && Number(report.participantAccountIDs?.[0]) === CONST.ACCOUNT_ID.CONCIERGE) {
parameters.isOldDotConciergeChat = true;
}

const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
Expand Down
Loading