From ce6b94913cd6dd52aecdaca1bce2769b6b4bb2a8 Mon Sep 17 00:00:00 2001
From: "quan.vo" <quan.vo@wizeline.com>
Date: Mon, 23 Sep 2024 15:25:01 +0700
Subject: [PATCH] Fix issue and increase some dependiences

---
 components/PopupMenu.tsx         | 13 +++++++++++++
 components/files/BottomModal.tsx | 13 +++++--------
 package-lock.json                | 22 +++++++++++++---------
 package.json                     |  4 ++--
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/components/PopupMenu.tsx b/components/PopupMenu.tsx
index 0b5cdc8..fdbd54a 100644
--- a/components/PopupMenu.tsx
+++ b/components/PopupMenu.tsx
@@ -28,6 +28,10 @@ import { faCamera } from "@fortawesome/free-solid-svg-icons/faCamera";
 import { faQrcode } from "@fortawesome/free-solid-svg-icons/faQrcode";
 import { useError } from "@/hooks/useError";
 import * as Linking from "expo-linking";
+import {
+  hasProblemDetails,
+  NOT_ACCEPTABLE_STATUS,
+} from "@inrupt/solid-client-errors";
 import { ThemedText } from "./ThemedText";
 
 const { width } = Dimensions.get("window");
@@ -61,6 +65,15 @@ const PopupMenu: React.FC<PopupMenuProps> = ({
     mutationFn: postFile,
     onSuccess: onUploadSuccess,
     onError: (error) => {
+      if (
+        error &&
+        hasProblemDetails(error) &&
+        error.problemDetails.status === NOT_ACCEPTABLE_STATUS
+      ) {
+        // This is the expected behavior of the Solid server. The file has already been uploaded to Solid, even though the server returned a 406 error.
+        onUploadSuccess();
+        return;
+      }
       console.debug("A non-HTTP error occurred.", error);
       showErrorMsg("Unable to save the file into your Wallet.");
     },
diff --git a/components/files/BottomModal.tsx b/components/files/BottomModal.tsx
index 9c6dafe..b602b43 100644
--- a/components/files/BottomModal.tsx
+++ b/components/files/BottomModal.tsx
@@ -56,7 +56,9 @@ const BottomModal: React.FC<BottomModalProps> = ({
   const [isShowQRCode, setShowQRCode] = useState(false);
   const deleteMutation = useMutation({
     mutationFn: deleteFile,
-    onSuccess: () => queryClient.refetchQueries({ queryKey: ["files"] }),
+    onSuccess: () => {
+      onDeleteSuccessfully?.();
+    },
     mutationKey: ["filesMutation"],
   });
   const queryClient = useQueryClient();
@@ -105,11 +107,6 @@ const BottomModal: React.FC<BottomModalProps> = ({
       // eslint-disable-next-line no-console
       .catch(() => console.error("Error while deleting data"));
     onCloseModal();
-    onDeleteSuccessfully?.();
-    queryClient
-      .refetchQueries({ queryKey: ["files"] })
-      // eslint-disable-next-line no-console
-      .catch(() => console.error("Error while refetching data"));
   };
 
   const onShareViaQR = () => {
@@ -161,7 +158,7 @@ const BottomModal: React.FC<BottomModalProps> = ({
             >
               <FontAwesome6 size={24} name="share" />
               <ThemedText style={{ paddingLeft: 24, fontSize: 16 }}>
-                Share via QR Code
+                Show QR Code
               </ThemedText>
             </TouchableOpacity>
             <TouchableOpacity
@@ -170,7 +167,7 @@ const BottomModal: React.FC<BottomModalProps> = ({
             >
               <FontAwesome6 size={24} name="download" />
               <ThemedText style={{ paddingLeft: 16, fontSize: 16 }}>
-                Download a copy
+                Share
               </ThemedText>
               {Boolean(fileDownload) && (
                 <ActivityIndicator
diff --git a/package-lock.json b/package-lock.json
index db2428e..3fabd61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@inrupt/solid-client-errors": "^0.0.2",
         "@react-native-cookies/cookies": "^6.2.1",
         "@react-navigation/native": "^6.1.18",
-        "@tanstack/react-query": "^5.51.23",
+        "@tanstack/react-query": "^5.56.2",
         "date-fns": "^3.6.0",
         "expo": "~51.0.31",
         "expo-build-properties": "~0.12.5",
@@ -42,7 +42,7 @@
         "react-native-gesture-handler": "~2.16.1",
         "react-native-qrcode-svg": "^6.3.1",
         "react-native-reanimated": "~3.10.1",
-        "react-native-safe-area-context": "4.10.5",
+        "react-native-safe-area-context": "4.11.0",
         "react-native-screens": "3.31.1",
         "react-native-svg": "15.2.0",
         "react-native-svg-transformer": "^1.5.0",
@@ -7100,7 +7100,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.51.21",
+      "version": "5.56.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.56.2.tgz",
+      "integrity": "sha512-gor0RI3/R5rVV3gXfddh1MM+hgl0Z4G7tj6Xxpq6p2I03NGPaJ8dITY9Gz05zYYb/EJq9vPas/T4wn9EaDPd4Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -7108,17 +7110,19 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.51.23",
+      "version": "5.56.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.56.2.tgz",
+      "integrity": "sha512-SR0GzHVo6yzhN72pnRhkEFRAHMsUo5ZPzAxfTMvUxFIDVS6W9LYUp6nXW3fcHVdg0ZJl8opSH85jqahvm6DSVg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.51.21"
+        "@tanstack/query-core": "5.56.2"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "react": "^18.0.0"
+        "react": "^18 || ^19"
       }
     },
     "node_modules/@testing-library/jest-native": {
@@ -18739,9 +18743,9 @@
       }
     },
     "node_modules/react-native-safe-area-context": {
-      "version": "4.10.5",
-      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.10.5.tgz",
-      "integrity": "sha512-Wyb0Nqw2XJ6oZxW/cK8k5q7/UAhg/wbEG6UVf89rQqecDZTDA5ic//P9J6VvJRVZerzGmxWQpVuM7f+PRYUM4g==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-4.11.0.tgz",
+      "integrity": "sha512-Bg7bozxEB+ZS+H3tVYs5yY1cvxNXgR6nRQwpSMkYR9IN5CbxohLnSprrOPG/ostTCd4F6iCk0c51pExEhifSKQ==",
       "license": "MIT",
       "peerDependencies": {
         "react": "*",
diff --git a/package.json b/package.json
index 3898bdc..3e31c5d 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@inrupt/solid-client-errors": "^0.0.2",
     "@react-native-cookies/cookies": "^6.2.1",
     "@react-navigation/native": "^6.1.18",
-    "@tanstack/react-query": "^5.51.23",
+    "@tanstack/react-query": "^5.56.2",
     "date-fns": "^3.6.0",
     "expo": "~51.0.31",
     "expo-build-properties": "~0.12.5",
@@ -51,7 +51,7 @@
     "react-native-gesture-handler": "~2.16.1",
     "react-native-qrcode-svg": "^6.3.1",
     "react-native-reanimated": "~3.10.1",
-    "react-native-safe-area-context": "4.10.5",
+    "react-native-safe-area-context": "4.11.0",
     "react-native-screens": "3.31.1",
     "react-native-svg": "15.2.0",
     "react-native-svg-transformer": "^1.5.0",