diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.js
deleted file mode 100644
index a8ad5f54a65f..000000000000
--- a/src/libs/setShouldShowComposeInputKeyboardAware/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as Composer from '../actions/Composer';
-
-export default (shouldShow) => {
-    Composer.setShouldShowComposeInput(shouldShow);
-};
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.ts
similarity index 61%
rename from src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
rename to src/libs/setShouldShowComposeInputKeyboardAware/index.native.ts
index 147d21d51168..f5d690db644d 100644
--- a/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.ts
@@ -1,8 +1,9 @@
-import {Keyboard} from 'react-native';
+import {EmitterSubscription, Keyboard} from 'react-native';
 import * as Composer from '../actions/Composer';
+import SetShouldShowComposeInputKeyboardAware from './types';
 
-let keyboardDidHideListener = null;
-export default (shouldShow) => {
+let keyboardDidHideListener: EmitterSubscription | null = null;
+const setShouldShowComposeInputKeyboardAware: SetShouldShowComposeInputKeyboardAware = (shouldShow) => {
     if (keyboardDidHideListener) {
         keyboardDidHideListener.remove();
         keyboardDidHideListener = null;
@@ -21,6 +22,8 @@ export default (shouldShow) => {
 
     keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
         Composer.setShouldShowComposeInput(true);
-        keyboardDidHideListener.remove();
+        keyboardDidHideListener?.remove();
     });
 };
+
+export default setShouldShowComposeInputKeyboardAware;
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.ts b/src/libs/setShouldShowComposeInputKeyboardAware/index.ts
new file mode 100644
index 000000000000..5ee36834ad5c
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.ts
@@ -0,0 +1,8 @@
+import * as Composer from '../actions/Composer';
+import SetShouldShowComposeInputKeyboardAware from './types';
+
+const setShouldShowComposeInputKeyboardAware: SetShouldShowComposeInputKeyboardAware = (shouldShow) => {
+    Composer.setShouldShowComposeInput(shouldShow);
+};
+
+export default setShouldShowComposeInputKeyboardAware;
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/types.ts b/src/libs/setShouldShowComposeInputKeyboardAware/types.ts
new file mode 100644
index 000000000000..7e3a604f562e
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/types.ts
@@ -0,0 +1,3 @@
+type SetShouldShowComposeInputKeyboardAware = (shouldShow: boolean) => void;
+
+export default SetShouldShowComposeInputKeyboardAware;