From a1f20a8a51125fd5703d841354e40d59e8e7e21e Mon Sep 17 00:00:00 2001
From: Aleksandr Kraiz <selfsurfer@gmail.com>
Date: Tue, 17 May 2022 02:36:50 +0400
Subject: [PATCH] Fix fetching

---
 package.json               | 2 +-
 src/fetchWithValidation.ts | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b901fdd..5402abf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.5.17",
+  "version": "0.5.18",
   "description": "Orion Protocol SDK",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
diff --git a/src/fetchWithValidation.ts b/src/fetchWithValidation.ts
index 0029a13..2950e77 100644
--- a/src/fetchWithValidation.ts
+++ b/src/fetchWithValidation.ts
@@ -84,9 +84,6 @@ export default async function fetchWithValidation<DataOut, DataIn, ErrorOut, Err
     });
   }
 
-  const textPayload = schema.safeParse(text);
-  if (textPayload.success) return ok(textPayload.data);
-
   const safeParseJson = fromThrowable(JSON.parse, (e) => {
     if (e instanceof Error) {
       return err({
@@ -106,7 +103,11 @@ export default async function fetchWithValidation<DataOut, DataIn, ErrorOut, Err
 
   const jsonResult = safeParseJson(text);
 
-  if (jsonResult.isErr()) return jsonResult.error;
+  if (jsonResult.isErr()) {
+    const textPayload = schema.safeParse(text);
+    if (textPayload.success) return ok(textPayload.data);
+    return jsonResult.error;
+  }
 
   const json: unknown = jsonResult.value;