Skip to content

🍒 Cherry pick PR #40655 to staging 🍒#40665

Merged
srikarparsi merged 3 commits intostagingfrom
mountiny-cherry-pick-staging-40655-1
Apr 21, 2024
Merged

🍒 Cherry pick PR #40655 to staging 🍒#40665
srikarparsi merged 3 commits intostagingfrom
mountiny-cherry-pick-staging-40655-1

Conversation

@os-botify
Copy link
Copy Markdown

@os-botify os-botify bot commented Apr 21, 2024

🍒 Cherry pick #40655 to staging 🍒

OSBotify and others added 2 commits April 21, 2024 21:31
@OSBotify
Update version to 1.4.63-16
e9fbdf3 
(cherry picked from commit acd2974)
@mountiny @OSBotify
Merge pull request #40655 from DylanDylann/fix/40543
9e87f88 
[CP Staging] Fix/40543: IOU - Currency in the amount editor is USD when the request is created in local currency

(cherry picked from commit 8e8b173)
@os-botify os-botify bot requested a review from a team as a code owner April 21, 2024 21:31
@os-botify
Copy link
Copy Markdown
Author

os-botify bot commented Apr 21, 2024

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot bot requested review from marcochavezf and removed request for a team April 21, 2024 21:32
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 21, 2024

@marcochavezf Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

mountiny
mountiny reviewed Apr 21, 2024
View reviewed changes
src/pages/iou/request/step/IOURequestStepAmount.tsx
},
},
backupTransaction: {
draftTransaction: {
Copy link
Copy Markdown
Contributor

@mountiny mountiny Apr 21, 2024

Choose a reason for hiding this comment

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

This is how staging looks like https://github.com/Expensify/App/blob/staging/src/pages/iou/request/step/IOURequestStepAmount.tsx

@mountiny
Copy link
Copy Markdown
Contributor

mountiny commented Apr 21, 2024

Tested the flow from #40655 works well

Screen.Recording.2024-04-21.at.23.47.21.mp4

srikarparsi
srikarparsi approved these changes Apr 21, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@srikarparsi srikarparsi left a comment

Choose a reason for hiding this comment

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

lgtm and looks like it tests well

@srikarparsi
Copy link
Copy Markdown
Contributor

srikarparsi commented Apr 21, 2024

Merging without checklists as per slack.

@srikarparsi srikarparsi merged commit f8d48b8 into staging Apr 21, 2024
@srikarparsi srikarparsi deleted the mountiny-cherry-pick-staging-40655-1 branch April 21, 2024 21:54
@srikarparsi srikarparsi mentioned this pull request Apr 21, 2024
Merged
50 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mountiny mountiny mountiny left review comments

@srikarparsi srikarparsi srikarparsi approved these changes

@marcochavezf marcochavezf Awaiting requested review from marcochavezf

Assignees

@mountiny mountiny

Labels

Engineering Hourly KSv2

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mountiny @srikarparsi @OSBotify