diff --git a/package-lock.json b/package-lock.json
index 6290c6f42c49..7de49ffeec78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21813,61 +21813,14 @@
       }
     },
     "react-native-onyx": {
-      "version": "git+https://github.com/Expensify/react-native-onyx.git#accabbd24b5d9a4556b9619a47ba081325622c46",
-      "from": "git+https://github.com/Expensify/react-native-onyx.git#accabbd24b5d9a4556b9619a47ba081325622c46",
+      "version": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1",
+      "from": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1",
       "requires": {
         "@react-native-community/async-storage": "^1.12.1",
-        "expensify-common": "git+https://github.com/Expensify/expensify-common.git#679fc86cfc4f9bc701e3757d583d74057edbbe28",
+        "expensify-common": "git+https://github.com/Expensify/expensify-common.git#2e5cff552cf132da90a3fb9756e6b4fb6ae7b40c",
         "lodash": "4.17.21",
         "react": "^16.13.1",
         "underscore": "^1.11.0"
-      },
-      "dependencies": {
-        "expensify-common": {
-          "version": "git+https://github.com/Expensify/expensify-common.git#679fc86cfc4f9bc701e3757d583d74057edbbe28",
-          "from": "git+https://github.com/Expensify/expensify-common.git#679fc86cfc4f9bc701e3757d583d74057edbbe28",
-          "requires": {
-            "classnames": "2.2.5",
-            "clipboard": "2.0.4",
-            "html-entities": "^1.3.1",
-            "jquery": "3.3.1",
-            "lodash": "4.17.21",
-            "prop-types": "15.7.2",
-            "react": "16.12.0",
-            "react-dom": "16.12.0",
-            "semver": "^7.3.4",
-            "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
-            "underscore": "1.9.1"
-          },
-          "dependencies": {
-            "react": {
-              "version": "16.12.0",
-              "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz",
-              "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==",
-              "requires": {
-                "loose-envify": "^1.1.0",
-                "object-assign": "^4.1.1",
-                "prop-types": "^15.6.2"
-              }
-            },
-            "underscore": {
-              "version": "1.9.1",
-              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-              "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
-            }
-          }
-        },
-        "react-dom": {
-          "version": "16.12.0",
-          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz",
-          "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==",
-          "requires": {
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.1",
-            "prop-types": "^15.6.2",
-            "scheduler": "^0.18.0"
-          }
-        }
       }
     },
     "react-native-pdf": {
diff --git a/package.json b/package.json
index 5bc456b2c2df..740f0a7180f5 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "react-native-image-picker": "^2.3.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^11.5.6",
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#accabbd24b5d9a4556b9619a47ba081325622c46",
+    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#586c76e7b90dbbde051d7ec7adbc4d53b2d51cd1",
     "react-native-pdf": "^6.2.2",
     "react-native-picker-select": "8.0.4",
     "react-native-reanimated": "1.13.2",
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 9b10a7bc4d51..e92424b3c4e8 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -47,6 +47,7 @@ function withLocalizeHOC(WrappedComponent) {
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
+                ref={props.forwardedRef}
                 translate={translations.translate}
                 numberFormat={translations.numberFormat}
                 timestampToRelative={translations.timestampToRelative}
@@ -59,9 +60,14 @@ function withLocalizeHOC(WrappedComponent) {
     WithLocalize.displayName = `WithLocalize(${getComponentDisplayName(WrappedComponent)})`;
     WithLocalize.propTypes = {
         preferredLocale: PropTypes.string,
+        forwardedRef: PropTypes.oneOfType([
+            PropTypes.func,
+            PropTypes.shape({current: PropTypes.instanceOf(React.Component)}),
+        ]),
     };
     WithLocalize.defaultProps = {
         preferredLocale: 'en',
+        forwardedRef: undefined,
     };
     return React.forwardRef((props, ref) => (
         // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index c590bc509d98..8e7516f807e8 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -181,7 +181,7 @@ class ReportActionCompose extends React.Component {
      * Focus the composer text input
      */
     focus() {
-        if (this.textInput && this.textInput.focus) {
+        if (this.textInput) {
             // There could be other animations running while we trigger manual focus.
             // This prevents focus from making those animations janky.
             InteractionManager.runAfterInteractions(() => {
