Skip to content

Reapply "Merge pull request #56092 from callstack-internal/feature/al…#65001

Merged
luacmartins merged 86 commits intoExpensify:mainfrom
callstack-internal:feature/allow-nagative-2
Oct 8, 2025
Merged

Reapply "Merge pull request #56092 from callstack-internal/feature/al…#65001
luacmartins merged 86 commits intoExpensify:mainfrom
callstack-internal:feature/allow-nagative-2

Conversation

@pasyukevich
Copy link
Member

@pasyukevich pasyukevich commented Jun 26, 2025

…low-negative"

This reverts commit e3255ba.

Re-apply changes of reverted PR: $#56092

Regressions reported previous time:
$ #65147
$ #64851
$ #64853
$ #64855
$ #64856
$ #64857
$ #64863
$ #64868
$ #64870
$ #64872
$ #64874
$ #64876
$ #64880
$ #64896
$ #64927
$ #64964
$ #71012

Explanation of Change

Fixed Issues

$ #53441
PROPOSAL:

Tests

📱 Mobile

1️⃣ Verify negative expense can be created without a workspace only to DM

(account without workspaces needed)

  • Open the Create Expense screen.
  • Enter an amount and press Flip.
  • Verify that a minus sign appears before the currency.
  • Press Next.
  • Verify that you can proceed only with the DM.

2️⃣ Verify negative value functionality

(workspace required before running this test)

  • Open the Create Expense screen.
  • Enter an amount and press Flip.
  • Verify that a minus sign appears before the currency.
  • Press Next.
  • Verify that the selected workspace is the receiver.
  • Confirm the amount is negative on the current screen and submit the expense.
  • Open the newly created expense.
  • Verify that the amount has a minus sign.
  • Tap the amount and confirm that the minus sign appears before the currency.
  • Enter a new amount, press Flip, and submit.
  • Verify that the updated value is correct.
  • Verify that the update confirmation message is correct.

3️⃣ Verify negative value option is not hidden for DM

  • Open DM.
  • Open the Create Expense screen.
  • Verify that the Flip button is not hidden.

4️⃣ Verify negative value option is hidden for Split Bill

  • Start creating a Split Bill.
  • Verify that the Flip button is disabled.
  • Complete creation of the Split Bill.
  • Open the created Split Bill.
  • Update the amount.
  • Verify that the amount updated correctly and the history comment is accurate.

💻 Desktop

⚠️ Note: No Flip button — negative value input is manual using -.


1️⃣ Verify negative expense cannot be created without a workspace

(account without workspaces needed)

  • Open the Create Expense screen.
  • Place the cursor at the start of the amount field and enter - followed by a number.
  • Verify that a minus sign appears before the currency.
  • Press Next.
  • Verify that you cannot proceed because a workspace is required.

2️⃣ Verify negative value functionality

(workspace required before running this test)

  • Open the Create Expense screen.
  • Place the cursor at the start of the amount field and enter - followed by a number.
  • Verify that a minus sign appears before the currency.
  • Press Next.
  • Verify that the selected workspace is the receiver.
  • Confirm the amount is negative on the current screen and submit the expense.
  • Open the newly created expense.
  • Verify that the amount has a minus sign.
  • Edit the amount and confirm that the minus sign appears before the currency in the input field.
  • Enter a new amount with - and submit.
  • Verify that the updated value is correct.
  • Verify that the update confirmation message is correct.

3️⃣ Verify negative value option is not hidden for DM

  • Open DM.
  • Open the Create Expense screen.
  • Attempt to enter -.
  • Verify that:
    • The minus sign is added

4️⃣ Verify negative value option is hidden for Split Bill

  • Start creating a Split Bill.

  • Attempt to enter - in the amount field.

  • Verify that:

    • The minus sign is ignored
  • Complete creation of the Split Bill.

  • Open the created Split Bill.

  • Update the amount (without minus).

  • Verify that the amount updated correctly and the history comment is accurate.

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Same as Tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android-native-converted.webm
Android: mWeb Chrome
android-web-converted.webm
iOS: Native
ios-native-converted.mp4
iOS: mWeb Safari
ios-web-converted.mp4
MacOS: Chrome / Safari
mac-web-converted.mov
MacOS: Desktop
mac-desktop-converted.mov

@melvin-bot
Copy link

melvin-bot bot commented Jun 26, 2025

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

return;
}
initializeAmount(amount);
initializeAmount(absoluteAmount);
Copy link
Contributor

Choose a reason for hiding this comment

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

@pasyukevich, we also need to set isNegative to false here to fix this issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks

I will check this

@pasyukevich
Copy link
Member Author

Updates:

  • Keep working on fixes for reported issues

@trjExpensify
Copy link
Contributor

👋 @pasyukevich did you get any further on the ETA to address the regressions in this PR? We're trying to decide if this will make it into the product release message going out on Monday or not.

@pasyukevich
Copy link
Member Author

Hi! @trjExpensify

Yes, I have. The fixes should be ready in the second half of next week. But I think it’s a bit early to announce that, as there might still be some hidden issues or missing links. We’ll also need to do more testing after the updates.

@pasyukevich
Copy link
Member Author

Updates:

@pasyukevich
Copy link
Member Author

Tommorow will be OOO

I will continue work here on monday

* Return the amount field from the transaction, return the modifiedAmount if present.
*/
function getAmount(transaction: OnyxInputOrEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false): number {
function getAmount(transaction: OnyxInputOrEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false, allowNegative = false, disableOppositeConversion = false): number {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you double check wherever getAmount is called, that it's passing the proper value for isFromExpenseReport? In Transaction.ts, seems like we're not passing anything, but maybe we should

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure, I will check

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, we are not passing the value from isFromExpenseReport in Transaction

I did not find anything that was broken due to this

I think we should create a separate PR to address this and verify - for me looks like a tech debt and more like an inconsistency that could lead to edge case bugs

That will update getTransactionPreviewTextAndTranslationPaths from TransactionPreviewUtils.ts
And getUpdateMoneyRequestParams from IOU.ts

@luacmartins luacmartins merged commit 9ef7cc5 into Expensify:main Oct 8, 2025
22 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Oct 8, 2025

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

OSBotify commented Oct 8, 2025

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.28-0 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

pasyukevich added a commit to callstack-internal/Expensify-App that referenced this pull request Oct 9, 2025
…ature/allow-nagative-2"

This reverts commit 9ef7cc5, reversing
changes made to fe1ccab.
pasyukevich added a commit to callstack-internal/Expensify-App that referenced this pull request Oct 9, 2025
…ature/allow-nagative-2"

This reverts commit 9ef7cc5, reversing
changes made to fe1ccab.
Comment on lines +611 to +612
if (reportUtilsIsPolicyExpenseChat(report) && !isEmptyObject(iouReport)) {
lastMessageTextFromReport = formatReportLastMessageText(getReportName(iouReport));
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this change is related to this issue (a demoted deploy blocker) #72139

Copy link
Contributor

Choose a reason for hiding this comment

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

@pasyukevich, this seems to be on purpose. Is there a reason/discussion about it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed, commented: #72139 (comment)

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.2.28-5 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅


return (
<>
<ScrollView contentContainerStyle={styles.flexGrow1}>
Copy link
Contributor

Choose a reason for hiding this comment

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

This caused the issue Split input field is not aligned on the right on confirm page, and we fixed it in this PR: #73228.

if (!isEmptyObject(iouReportAction) && !isIOUReport(report) && iouReportAction && isSplitBillReportAction(iouReportAction)) {
// This covers group chats where the last action is a split expense action
const linkedTransaction = getLinkedTransaction(iouReportAction);
if (isEmptyObject(linkedTransaction)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

We missed adding a fallback to format the message, which caused issue #72149. More details are available in the OP of PR #73071.

const transactionViolations = useTransactionViolations(transaction?.transactionID);
const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true});

const allowNegativeAmount = shouldEnableNegative(report, policy);
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #72165 checklist: this change missed adding the iouType parameter, causing invoices to incorrectly return false for negative amount allowance. We should pass iouType the same way as in IOURequestStepAmount

onMouseDown={(event) => focusTextInput(event, [NUMBER_VIEW_ID])}
style={[styles.moneyRequestAmountContainer, styles.flexRow, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}
>
{textInputComponent}
Copy link
Contributor

Choose a reason for hiding this comment

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

These changes caused the input to lose focus when clicking outside (see #72160). This PR updates the styles to fix the issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.