🍒 Cherry pick PR #36497 to staging 🍒 #36549
Conversation
![os-botify[bot]](https://avatars.githubusercontent.com/in/365978?s=60&v=4){kind=small}
|
Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers! |
|
This pull request has merge conflicts and can not be automatically merged. 😞 |
|
@cristipaval 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] |
|
Okay, this ends up being tricky since on main the file was converted to TS, and then the merge conflict on main ended up conflicting with one of these removed files - but now we're trying to CP this new change which would bring forward those typescript changes which are not yet available on staging. I don't want to accidently break staging, and looking at the deploy blocker issues it solves, it doesn't look like a high priority so I am just going to let this go through the normal deploy process cc @amyevans |
| <<<<<<< HEAD | ||
| {value: amount, currency = CONST.CURRENCY.USD, extraDecimals = 0, errorText, onInputChange, onCurrencyButtonPress}: AmountFormProps, | ||
| forwardedRef: ForwardedRef<TextInput>, | ||
| ======= | ||
| {value: amount, currency = CONST.CURRENCY.USD, extraDecimals = 0, errorText, onInputChange, onCurrencyButtonPress, isCurrencyPressable = true}: AmountFormProps, | ||
| forwardedRef: ForwardedRef<BaseTextInputRef>, | ||
| >>>>>>> af1026e (Merge pull request #36497 from shubham1206agra/fix-currency-ui) |
There was a problem hiding this comment.
I think to solve it you'd just need to copy over the isCurrencyPressable = true param to line 54, but def understand if you don't wanna worry about it and just make the issues NABs
There was a problem hiding this comment.
That is one thing, but also BaseTextInputRef doesn't exist here yet and then I found a couple other files with missing imports so I didn't want to risk it since I'm not sure what is not on staging yet. I'd have to correct all of those files :yikes:
There was a problem hiding this comment.
ah okay yeah fair enough! :nevermind:
🍒 Cherry pick #36497 to staging 🍒