chore: resolved pr conflicts

Author: shayan-deriv

package-lock.json

@@ -31,6 +31,9 @@
         "test": "jest",
         "test:report": "jest --collectCoverage"
     },
+    "dependencies": {
+        "@types/react-modal": "^3.16.3"
+    },
     "devDependencies": {
         "@babel/preset-env": "^7.24.3",
         "@babel/preset-react": "^7.24.1",
@@ -55,7 +58,6 @@
         "@types/node": "^20.11.30",
         "@types/react": "^18.2.72",
         "@types/react-dom": "^18.2.22",
-        "@types/react-modal": "^3.16.3",
         "@typescript-eslint/eslint-plugin": "^7.4.0",
         "@typescript-eslint/parser": "^7.4.0",
         "@vitejs/plugin-react": "^4.2.1",