From 075460608946872cd2564d43d4c4fa1cc98a404b Mon Sep 17 00:00:00 2001
From: Felipe Mendes <zo.fmendes@gmail.com>
Date: Tue, 4 Apr 2023 15:24:43 -0300
Subject: [PATCH] fix: UI graphql quries (#205)

* fix: graphql codegen rename Transfer entity to fix composition merge

* fix: scroll triggering refetch with query error

* fix: skip getENSNamesDocument when address is undefined
---
 ui/.graphclientrc.yml                          |  7 +++++++
 ui/package.json                                |  1 +
 .../explore/list-nfas/nfa-list/nfa-list.tsx    |  2 +-
 .../fields/ens-domain-field/ens-field.tsx      |  2 +-
 ui/yarn.lock                                   | 18 +++++++++++++++++-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ui/.graphclientrc.yml b/ui/.graphclientrc.yml
index bb39726..1ab1e73 100644
--- a/ui/.graphclientrc.yml
+++ b/ui/.graphclientrc.yml
@@ -4,10 +4,17 @@ sources:
     handler:
       graphql:
         endpoint: https://api.thegraph.com/subgraphs/name/emperororokusaki/flk-test-subgraph #replace for nfa subgraph
+
   - name: ENS
     handler:
       graphql:
         endpoint: https://api.thegraph.com/subgraphs/name/ensdomains/ens
+    transforms:
+      - rename:
+          - from:
+              type: Transfer
+            to:
+              type: ENSTransfer
 
 documents:
   - ./graphql/*.graphql
diff --git a/ui/package.json b/ui/package.json
index 28e0956..57831ed 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -41,6 +41,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@graphprotocol/client-cli": "^2.2.19",
+    "@graphql-mesh/transform-rename": "^0.14.22",
     "@types/jest": "^29.2.3",
     "@types/node": "^18.11.9",
     "@types/react": "^18.0.25",
diff --git a/ui/src/views/explore/list-nfas/nfa-list/nfa-list.tsx b/ui/src/views/explore/list-nfas/nfa-list/nfa-list.tsx
index 6dbc468..9ff7dd5 100644
--- a/ui/src/views/explore/list-nfas/nfa-list/nfa-list.tsx
+++ b/ui/src/views/explore/list-nfas/nfa-list/nfa-list.tsx
@@ -42,7 +42,7 @@ export const NFAList: React.FC = () => {
   }, []);
 
   useWindowScrollEnd(() => {
-    if (isLoading || endReached) return;
+    if (isLoading || endReached || queryError) return;
     setPageNumber((prevState) => prevState + 1);
   });
 
diff --git a/ui/src/views/mint/nfa-step/form-step/fields/ens-domain-field/ens-field.tsx b/ui/src/views/mint/nfa-step/form-step/fields/ens-domain-field/ens-field.tsx
index 0f695f2..e97b82c 100644
--- a/ui/src/views/mint/nfa-step/form-step/fields/ens-domain-field/ens-field.tsx
+++ b/ui/src/views/mint/nfa-step/form-step/fields/ens-domain-field/ens-field.tsx
@@ -13,8 +13,8 @@ export const EnsField: React.FC = () => {
   const { data, error } = useQuery(getENSNamesDocument, {
     variables: {
       address: address?.toString() || '', //should skip if undefined
-      skip: address === undefined,
     },
+    skip: address === undefined,
   });
 
   const {
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 4ca3c55..441a073 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1855,6 +1855,15 @@
     lodash.get "4.4.2"
     tslib "^2.4.0"
 
+"@graphql-mesh/transform-rename@^0.14.22":
+  version "0.14.22"
+  resolved "https://registry.yarnpkg.com/@graphql-mesh/transform-rename/-/transform-rename-0.14.22.tgz#30d8a26938a37438dae7db5763d0650b07caad85"
+  integrity sha512-Tc7KYzIt9M3vHs1kMi+AqeFmSOpO7yN0ST4zqEkJNcFbFh7UKyCrIxc4Rk5ayUS+vDM6L65c3J8VpjsXzwLkzw==
+  dependencies:
+    "@graphql-tools/delegate" "9.0.28"
+    "@graphql-tools/wrap" "9.3.8"
+    graphql-scalars "^1.20.4"
+
 "@graphql-mesh/transform-type-merging@0.5.15":
   version "0.5.15"
   resolved "https://registry.yarnpkg.com/@graphql-mesh/transform-type-merging/-/transform-type-merging-0.5.15.tgz#ff180d25dd22642be972302c5d2c539f33992db5"
@@ -2161,7 +2170,7 @@
     tslib "^2.4.0"
     value-or-promise "1.0.12"
 
-"@graphql-tools/wrap@^9.3.6":
+"@graphql-tools/wrap@9.3.8", "@graphql-tools/wrap@^9.3.6":
   version "9.3.8"
   resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.3.8.tgz#c6f53b7bc98cf3fa3d91e41be3b99254ae99b409"
   integrity sha512-MGsExYPiILMw4Qff7HcvE9MMSYdjb/tr5IQYJbxJIU4/TrBHox1/smne8HG+Bd7kmDlTTj7nU/Z8sxmoRd0hOQ==
@@ -6588,6 +6597,13 @@ graphql-import-node@0.0.5:
   resolved "https://registry.yarnpkg.com/graphql-import-node/-/graphql-import-node-0.0.5.tgz#caf76a6cece10858b14f27cce935655398fc1bf0"
   integrity sha512-OXbou9fqh9/Lm7vwXT0XoRN9J5+WCYKnbiTalgFDvkQERITRmcfncZs6aVABedd5B85yQU5EULS4a5pnbpuI0Q==
 
+graphql-scalars@^1.20.4:
+  version "1.21.3"
+  resolved "https://registry.yarnpkg.com/graphql-scalars/-/graphql-scalars-1.21.3.tgz#21eb0b9349cc94ae62b40f40ebe87220d3a5f1b1"
+  integrity sha512-QLWw3BHmqHZMp9JeYmPpjq7JT9aw/H8TpwmWKJEuMSE3+O7Xe7TduQbOLFzbs1q9UxX6CVkc0O1JO/YfkP/pAw==
+  dependencies:
+    tslib "^2.5.0"
+
 graphql-tag@^2.11.0, graphql-tag@^2.12.6:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"