Skip to content

🍒 Cherry pick PR #30962 to staging 🍒#31042

Merged
mountiny merged 486 commits into
stagingfrom
thienlnam-cherry-pick-staging-30962-1
Nov 8, 2023
Merged

🍒 Cherry pick PR #30962 to staging 🍒#31042
mountiny merged 486 commits into
stagingfrom
thienlnam-cherry-pick-staging-30962-1

Conversation

@os-botify

@os-botify os-botify Bot commented Nov 8, 2023

Copy link
Copy Markdown

🍒 Cherry pick #30962 to staging 🍒

fabioh8010 and others added 30 commits October 27, 2023 06:35
…ture/29593-optimistic-money-requests-hidden
luacmartins and others added 12 commits November 7, 2023 13:06
…Balance

[TS migration] Migrate 'CurrentWalletBalance.js' component to TypeScript
fix: remove wrong use of createRef
fix: 30988 New dot opens when navigate to the staging magic link, not abracadabra page
Fix: Add not allowed sign for archived workspace.
…text-input-component

[TS migration] Migrate 'RNTextInput.js' component to TypeScript
Fix: 2FA code should auto-submit after entering the code for the first time
…unction-component

Migrate Button.js to function component
(cherry picked from commit 24184e4)
fix: remove wrong use of createRef
(cherry picked from commit 73ded84)
@os-botify os-botify Bot requested a review from a team as a code owner November 8, 2023 06:27
@os-botify

os-botify Bot commented Nov 8, 2023

Copy link
Copy Markdown
Author

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 November 8, 2023 06:27
@melvin-bot

melvin-bot Bot commented Nov 8, 2023

Copy link
Copy Markdown

@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]

thienlnam
thienlnam previously approved these changes Nov 8, 2023
@thienlnam

Copy link
Copy Markdown
Contributor

Ah crap missed the conflict

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good to me

@mountiny mountiny merged commit e1561b9 into staging Nov 8, 2023
@mountiny mountiny deleted the thienlnam-cherry-pick-staging-30962-1 branch November 8, 2023 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.