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.

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

Update "submitted by harvesting" report action copy #48939

Merged
merged 20 commits into from
Sep 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
baf36ec
Add optional harvesting key for delayed auto submit
Beamanator Sep 10, 2024
a019fe1
A few new consts for help sites
Beamanator Sep 10, 2024
292c0a9
New function for building automatically submitted report message
Beamanator Sep 10, 2024
c690569
Conditionally show type of submitted message
Beamanator Sep 10, 2024
4181193
Add in translations
Beamanator Sep 10, 2024
a307b5e
Fix type issues
Beamanator Sep 10, 2024
68eb6a5
Style fixes
Beamanator Sep 10, 2024
d85051d
Merge branch 'main' of github.com:Expensify/App into beaman-updateSub…
Beamanator Sep 10, 2024
bf23be5
Merge branch 'main' of github.com:Expensify/App into beaman-updateSub…
Beamanator Sep 11, 2024
2992186
Merge branch 'main' of github.com:Expensify/App into beaman-updateSub…
Beamanator Sep 12, 2024
8b6d355
Update src/languages/es.ts
Beamanator Sep 17, 2024
3afaa62
Merge branch 'main' of github.com:Expensify/App into beaman-updateSub…
Beamanator Sep 20, 2024
efb41e6
Merge branch 'beaman-updateSubmittedByHarvestingCopy' of github.com:E…
Beamanator Sep 20, 2024
e7523d9
Get user wallet with useOnyx
Beamanator Sep 20, 2024
c077731
Fix getting wallet from onyx
Beamanator Sep 20, 2024
63679a1
UseOnyx to get emoji reactions
Beamanator Sep 20, 2024
5a1d6e4
Move linked transaction route error for useOnyx
Beamanator Sep 20, 2024
140f1dc
Get iouReport with useOnyx
Beamanator Sep 20, 2024
0bde076
Prettify, remove withOnyx import
Beamanator Sep 20, 2024
80d0909
Merge branch 'main' of github.com:Expensify/App into beaman-updateSub…
Beamanator Sep 25, 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
Prev Previous commit
Next Next commit
Get user wallet with useOnyx
Beamanator committed Sep 20, 2024
commit e7523d944edb1dfd559679c6bdbe6f9878ad75ac
8 changes: 1 addition & 7 deletions src/pages/home/report/ReportActionItem.tsx
Original file line number Diff line number Diff line change
@@ -88,9 +88,6 @@ type ReportActionItemOnyxProps = {

emojiReactions: OnyxEntry<OnyxTypes.ReportActionReactions>;

/** The user's wallet account */
userWallet: OnyxEntry<OnyxTypes.UserWallet>;

/** The transaction (linked with the report action) route error */
linkedTransactionRouteError: NonNullable<OnyxEntry<Errors>> | null;
};
@@ -164,7 +161,6 @@ function ReportActionItem({
isMostRecentIOUReportAction,
parentReportAction,
shouldDisplayNewMarker,
userWallet,
shouldHideThreadDividerLine = false,
shouldShowSubscriptAvatar = false,
onPress = undefined,
@@ -203,6 +199,7 @@ function ReportActionItem({
const popoverAnchorRef = useRef<Exclude<ReportActionContextMenu.ContextMenuAnchor, TextInput>>(null);
const downloadedPreviews = useRef<string[]>([]);
const prevDraftMessage = usePrevious(draftMessage);
const userWallet = useOnyx(ONYXKEYS.USER_WALLET);

// The app would crash due to subscribing to the entire report collection if parentReportID is an empty string. So we should have a fallback ID here.
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -1018,9 +1015,6 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
initialValue: {},
},
userWallet: {
key: ONYXKEYS.USER_WALLET,
},
linkedTransactionRouteError: {
key: ({action}) =>
`${ONYXKEYS.COLLECTION.TRANSACTION}${ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID ?? -1 : -1}`,