diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js
deleted file mode 100644
index 4306b0cff3f6..000000000000
--- a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function canUseTouchScreen() {
-    return true;
-}
-
-export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts
new file mode 100644
index 000000000000..60980801e73c
--- /dev/null
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts
@@ -0,0 +1,5 @@
+import CanUseTouchScreen from './types';
+
+const canUseTouchScreen: CanUseTouchScreen = () => true;
+
+export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.js b/src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
similarity index 51%
rename from src/libs/DeviceCapabilities/canUseTouchScreen/index.js
rename to src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
index 17dcc9dffd73..9e21f5a42b5d 100644
--- a/src/libs/DeviceCapabilities/canUseTouchScreen/index.js
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
@@ -1,29 +1,38 @@
+import {Merge} from 'type-fest';
+import CanUseTouchScreen from './types';
+
+type ExtendedNavigator = Merge<Navigator, {msMaxTouchPoints: number}>;
+
 /**
  * Allows us to identify whether the platform has a touchscreen.
  *
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
- *
- * @returns {Boolean}
  */
-function canUseTouchScreen() {
+const canUseTouchScreen: CanUseTouchScreen = () => {
     let hasTouchScreen = false;
+
+    // TypeScript removed support for msMaxTouchPoints, this doesn't mean however that
+    // this property doesn't exist - hence the use of ExtendedNavigator to ensure
+    // that the functionality doesn't change
+    // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1029
     if ('maxTouchPoints' in navigator) {
         hasTouchScreen = navigator.maxTouchPoints > 0;
     } else if ('msMaxTouchPoints' in navigator) {
-        hasTouchScreen = navigator.msMaxTouchPoints > 0;
+        hasTouchScreen = (navigator as ExtendedNavigator).msMaxTouchPoints > 0;
     } else {
-        const mQ = window.matchMedia && matchMedia('(pointer:coarse)');
+        // Same case as for Navigator - TypeScript thinks that matchMedia is obligatory property of window although it may not be
+        const mQ = window.matchMedia?.('(pointer:coarse)');
         if (mQ && mQ.media === '(pointer:coarse)') {
             hasTouchScreen = !!mQ.matches;
         } else if ('orientation' in window) {
             hasTouchScreen = true; // deprecated, but good fallback
         } else {
             // Only as a last resort, fall back to user agent sniffing
-            const UA = navigator.userAgent;
+            const UA = (navigator as ExtendedNavigator).userAgent;
             hasTouchScreen = /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) || /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA);
         }
     }
     return hasTouchScreen;
-}
+};
 
 export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts b/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts
new file mode 100644
index 000000000000..6b71ecffeb05
--- /dev/null
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts
@@ -0,0 +1,3 @@
+type CanUseTouchScreen = () => boolean;
+
+export default CanUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.js b/src/libs/DeviceCapabilities/hasHoverSupport/index.js
deleted file mode 100644
index 84a3fbbc5ed1..000000000000
--- a/src/libs/DeviceCapabilities/hasHoverSupport/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Allows us to identify whether the platform is hoverable.
- *
- * @returns {Boolean}
- */
-function hasHoverSupport() {
-    return window.matchMedia('(hover: hover) and (pointer: fine)').matches;
-}
-
-export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.native.js b/src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
similarity index 52%
rename from src/libs/DeviceCapabilities/hasHoverSupport/index.native.js
rename to src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
index d77fcc17448a..097b3b0cbba1 100644
--- a/src/libs/DeviceCapabilities/hasHoverSupport/index.native.js
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
@@ -1,9 +1,8 @@
+import HasHoverSupport from './types';
+
 /**
  * Allows us to identify whether the platform is hoverable.
- *
- * @returns {Boolean}
  */
-
-const hasHoverSupport = () => false;
+const hasHoverSupport: HasHoverSupport = () => false;
 
 export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.ts b/src/libs/DeviceCapabilities/hasHoverSupport/index.ts
new file mode 100644
index 000000000000..1ff0f461db69
--- /dev/null
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/index.ts
@@ -0,0 +1,8 @@
+import HasHoverSupport from './types';
+
+/**
+ * Allows us to identify whether the platform is hoverable.
+ */
+const hasHoverSupport: HasHoverSupport = () => window.matchMedia?.('(hover: hover) and (pointer: fine)').matches;
+
+export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/types.ts b/src/libs/DeviceCapabilities/hasHoverSupport/types.ts
new file mode 100644
index 000000000000..b8fe944cf88e
--- /dev/null
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/types.ts
@@ -0,0 +1,3 @@
+type HasHoverSupport = () => boolean;
+
+export default HasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/index.js b/src/libs/DeviceCapabilities/index.ts
similarity index 100%
rename from src/libs/DeviceCapabilities/index.js
rename to src/libs/DeviceCapabilities/index.ts