Merge branch 'main' into upgrade

NCUAppTeam · Feb 7, 2023 · bc8366c · bc8366c
2 parents 9564c06 + 1072fed
commit bc8366c
Show file tree

Hide file tree

Showing 24 changed files with 1,712 additions and 2,220 deletions.
diff --git a/controller/Bus.js b/controller/Bus.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "fuse.js": "^6.6.2",
     "jssha": "^3.3.0",
     "native-base": "^3.4.22",
+    "qs": "^6.11.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",
     "react-native": "0.70.5",
@@ -42,8 +43,8 @@
     "react-native-safe-area-context": "4.4.1",
     "react-native-screens": "~3.18.0",
     "react-native-svg": "13.4.0",
-    "url": "^0.11.0",
-    "react-native-webview": "11.23.1"
+    "react-native-webview": "11.23.1",
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",