Rebase branches & updated outdated packages #454

Real-Dev-Squad · Oct 12, 2024 · a0737dc · a0737dc
2 parents ca5b408 + 7e4a55a
commit a0737dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -82,7 +82,6 @@
     "@types/jest": "^26.0.24",
     "@types/react": "^18.3.11",
     "@types/react-native": "^0.66.34",
-    "@types/react-native-datepicker": "^1.7.1",
     "@types/react-test-renderer": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.7.0",
     "@typescript-eslint/parser": "^5.62.0",

diff --git a/yarn.lock b/yarn.lock
@@ -7201,12 +7201,20 @@ react-native-collapsible@^1.6.1:
   integrity sha512-orF4BeiXd2hZW7fu9YcqIJXzN6TJcFcddY807D3MAOVktLuW9oQ+RIkrTJ5DR3v9ZOFfREkOjEmS79qeUTvkBQ==
 
 react-native-date-picker@^4.2.13:
-  version "4.2.13"
-  resolved "https://registry.npmjs.org/react-native-date-picker/-/react-native-date-picker-4.2.13.tgz"
-  integrity sha512-cQ3k+ExXggAnytomeNGNrtV/l2a7WzVUeWKo7Gs2pv/z3TCjjlmKn0ZBMPgcThrFAgFMxgYI0XzKVKT7TPsOmw==
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/react-native-date-picker/-/react-native-date-picker-4.4.2.tgz#f7bb9daa8559237e08bd30f907ee8487a6e2a6ec"
+  integrity sha512-wYKN8nYWhETVHJV/+Im30JOdzkFRwYRrDlEOyyYesOjt+1JTFJh9M7K5CqePLOIB4Nxlf2f2lRSI0VoUyFIovA==
+
+<<<<<<< HEAD
+=======
+react-native-datepicker@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.npmjs.org/react-native-datepicker/-/react-native-datepicker-1.7.2.tgz"
+  integrity sha512-ses0N1y44fYBmlejYwR2i+dGnQQ8v5/gacX2CrbFJiWxbcQaRuxexsZPB9YQuQkAy+uKz5Gti3Lrp3dh9BfkzA==
   dependencies:
-    prop-types "^15.8.1"
+    moment "^2.22.0"
 
+>>>>>>> 7e4a55a43ec67d91a0bba76102a0cf2564a1cc92
 react-native-device-info@^10.14.0:
   version "10.14.0"
   resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-10.14.0.tgz#3530ea7e09a0841d568fec987b8c6ae16deee763"