feat(explorer): add long text component for hashes and tx viewer

2023-01-27 18:13:02 +00:00
67 changed files with 854 additions and 912 deletions
@@ -5,7 +5,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "73487.251446645509463922",
+    "locked_amount": "73961.6625805406210086218",
    "deposits": [
      {
        "amount": "86666.297",
@@ -71,7 +71,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "1682.6333244301995",
+    "locked_amount": "1710.0785065628815",
    "deposits": [
      {
        "amount": "2500",
@@ -450,7 +450,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "73420.20357622098315111",
+    "locked_amount": "73894.181869649098296045",
    "deposits": [
      {
        "amount": "129999.45",
@@ -516,7 +516,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "37130.49642947742434",
+    "locked_amount": "37473.16870243530666",
    "deposits": [
      {
        "amount": "10000",
@@ -709,7 +709,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "3157.4754249112125",
+    "locked_amount": "3184.845414764079",
    "deposits": [
      {
        "amount": "5000",
@@ -920,7 +920,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "15240.5819298544871083824",
+    "locked_amount": "15705.5104826322582056334",
    "deposits": [
      {
        "amount": "97499.58",
@@ -953,7 +953,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "98230.390980249184455396",
-    "locked_amount": "20831.244321407448710024671284",
+    "locked_amount": "21466.721386488566701750705764",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -999,7 +999,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "6411.4496271174975967098",
+    "locked_amount": "6607.0370403844561078578",
    "deposits": [
      {
        "amount": "32499.86",
@@ -1032,7 +1032,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "2086.8646383922243299952",
+    "locked_amount": "2150.5264434752857381272",
    "deposits": [
      {
        "amount": "10833.29",
@@ -1065,7 +1065,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "0",
-    "locked_amount": "7801.1661111092940288519",
+    "locked_amount": "8039.148157117145325033",
    "deposits": [
      {
        "amount": "6500",
@@ -1203,8 +1203,8 @@
    "tranche_start": "2022-11-01T00:00:00.000Z",
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
-    "total_removed": "3707.308452225",
-    "locked_amount": "11373.775610036832",
+    "total_removed": "3539.640404325",
+    "locked_amount": "11622.146926795578",
    "deposits": [
      {
        "amount": "7500",
@@ -1218,11 +1218,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "167.6680479",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x3bd3579f34ddc1eee597ba9b3fbbf18b6c268d085cd299e964b7239b2434fcf3"
-      },
      {
        "amount": "305.3119245",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -1286,12 +1281,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "167.6680479",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 33,
-            "tx": "0x3bd3579f34ddc1eee597ba9b3fbbf18b6c268d085cd299e964b7239b2434fcf3"
-          },
          {
            "amount": "305.3119245",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -1354,8 +1343,8 @@
          }
        ],
        "total_tokens": "7500",
-        "withdrawn_tokens": "3707.308452225",
-        "remaining_tokens": "3792.691547775"
+        "withdrawn_tokens": "3539.640404325",
+        "remaining_tokens": "3960.359595675"
      },
      {
        "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -1380,7 +1369,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "656363.903872495430316328",
+    "locked_amount": "666983.06788767317384942",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -1732,7 +1721,7 @@
    "tranche_end": "2023-02-01T00:00:00.000Z",
    "total_added": "42500",
    "total_removed": "24434.0787288",
-    "locked_amount": "576.45383579911392",
+    "locked_amount": "1037.950539704105075",
    "deposits": [
      {
        "amount": "12500",
@@ -6722,65 +6711,10 @@
    "tranche_id": 11,
    "tranche_start": "2021-09-03T00:00:00.000Z",
    "tranche_end": "2022-09-03T00:00:00.000Z",
-    "total_added": "53995.000000000000000003",
-    "total_removed": "42939.21518131551",
+    "total_added": "53684.000000000000000003",
+    "total_removed": "42606.21518131551",
    "locked_amount": "0",
    "deposits": [
-      {
-        "amount": "45",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0xa6c36806aba504d0a30c574f6ab4dc2d76aad26d8759c778feb6bf27729cddcf"
-      },
-      {
-        "amount": "46",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x0f0f261dd8e05919d3c6c1d4358434e2c9c1b9087347702d2b8a4b1aeecd7e4b"
-      },
-      {
-        "amount": "50",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0xe66d0dc85202757228ed7c7ea7138710b00755f69d604e6a7199c2759370aef8"
-      },
-      {
-        "amount": "30",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x470591c033f228afd59d498fcf42ecba8b83d389042d5c43e5af277e8deed9fe"
-      },
-      {
-        "amount": "30",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x86543ba39726b072d1b338fc9bf4852b5707ccfdf9abaf6ce21b85d76591b3cd"
-      },
-      {
-        "amount": "15",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x0f98bf0636a4f08d09d40b227beb78d7aaf57d6c856dd44ea0c6c29cc965c6c2"
-      },
-      {
-        "amount": "20",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0xca73109b8c348b6df6723c5a67616d2406784d56718731264e97a49cf4d314fb"
-      },
-      {
-        "amount": "20",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x1a3c1319ece46cec553198ce7fb164670a5322a97afbcf432a44d524ace7267d"
-      },
-      {
-        "amount": "20",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0xb2617627421f96ca8e732982a756dd98ff8889871f64def89f2971ead24c8fe7"
-      },
-      {
-        "amount": "20",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x8b2831993c44c6baa40677a9ac5055f244f15ed005cddf3419226c86280ff93a"
-      },
-      {
-        "amount": "15",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0x6957b2bd0f9f04f7cc124c11638be50ff5e2a26412e0be0c16f7aac1f1b73bc6"
-      },
      {
        "amount": "20",
        "user": "0xB12Cdb63E38f9a6ff2C0F68aBC3CA9beFCb7148c",
@@ -16713,21 +16647,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "311",
-        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "tx": "0xa94f27a51d17008d4f8c62a11f65db9dc3f94eb430b2842b0cb8403c29951658"
-      },
-      {
-        "amount": "10",
-        "user": "0xa2920abaA03b696C7B90486600D578b455E11609",
-        "tx": "0xc454f6f2572533714b74636b4243ba8fd5456a6f67ef8b93051588b156ab2093"
-      },
-      {
-        "amount": "12",
-        "user": "0xa10aD7E7712617fc4ABe0811D8a30fD96cE48F9f",
-        "tx": "0x7ffe3e795b50a8449052143a739d53aec81c2f53c7981f31496b8c121bd4ec81"
-      },
      {
        "amount": "200",
        "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
@@ -17690,112 +17609,6 @@
      }
    ],
    "users": [
-      {
-        "address": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-        "deposits": [
-          {
-            "amount": "45",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xa6c36806aba504d0a30c574f6ab4dc2d76aad26d8759c778feb6bf27729cddcf"
-          },
-          {
-            "amount": "46",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x0f0f261dd8e05919d3c6c1d4358434e2c9c1b9087347702d2b8a4b1aeecd7e4b"
-          },
-          {
-            "amount": "50",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xe66d0dc85202757228ed7c7ea7138710b00755f69d604e6a7199c2759370aef8"
-          },
-          {
-            "amount": "30",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x470591c033f228afd59d498fcf42ecba8b83d389042d5c43e5af277e8deed9fe"
-          },
-          {
-            "amount": "30",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x86543ba39726b072d1b338fc9bf4852b5707ccfdf9abaf6ce21b85d76591b3cd"
-          },
-          {
-            "amount": "15",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x0f98bf0636a4f08d09d40b227beb78d7aaf57d6c856dd44ea0c6c29cc965c6c2"
-          },
-          {
-            "amount": "20",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xca73109b8c348b6df6723c5a67616d2406784d56718731264e97a49cf4d314fb"
-          },
-          {
-            "amount": "20",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x1a3c1319ece46cec553198ce7fb164670a5322a97afbcf432a44d524ace7267d"
-          },
-          {
-            "amount": "20",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xb2617627421f96ca8e732982a756dd98ff8889871f64def89f2971ead24c8fe7"
-          },
-          {
-            "amount": "20",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x8b2831993c44c6baa40677a9ac5055f244f15ed005cddf3419226c86280ff93a"
-          },
-          {
-            "amount": "15",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x6957b2bd0f9f04f7cc124c11638be50ff5e2a26412e0be0c16f7aac1f1b73bc6"
-          },
-          {
-            "amount": "100",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x4b249ec22c90d0f4d1d472c407e8c27b1a87db2c5d822d600636f9b17406588a"
-          },
-          {
-            "amount": "60",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0x6a8d2bd962a14937de4beb99bff97cf55fd823de00b96c49e5e4e97b5b68f40f"
-          },
-          {
-            "amount": "40",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xea7d189a9ad2d7ee3a93dd352201d19b1128ccf46246b1ec346c8ee1b9f7ea62"
-          }
-        ],
-        "withdrawals": [
-          {
-            "amount": "311",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xa94f27a51d17008d4f8c62a11f65db9dc3f94eb430b2842b0cb8403c29951658"
-          },
-          {
-            "amount": "200",
-            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
-            "tranche_id": 11,
-            "tx": "0xf7ad77b4bb44e24178d182db393ace12f22021706d6583d438b285621eaf8b01"
-          }
-        ],
-        "total_tokens": "511",
-        "withdrawn_tokens": "511",
-        "remaining_tokens": "0"
-      },
      {
        "address": "0xB12Cdb63E38f9a6ff2C0F68aBC3CA9beFCb7148c",
        "deposits": [
@@ -19140,6 +18953,40 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "905"
      },
+      {
+        "address": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
+        "deposits": [
+          {
+            "amount": "100",
+            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
+            "tranche_id": 11,
+            "tx": "0x4b249ec22c90d0f4d1d472c407e8c27b1a87db2c5d822d600636f9b17406588a"
+          },
+          {
+            "amount": "60",
+            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
+            "tranche_id": 11,
+            "tx": "0x6a8d2bd962a14937de4beb99bff97cf55fd823de00b96c49e5e4e97b5b68f40f"
+          },
+          {
+            "amount": "40",
+            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
+            "tranche_id": 11,
+            "tx": "0xea7d189a9ad2d7ee3a93dd352201d19b1128ccf46246b1ec346c8ee1b9f7ea62"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "200",
+            "user": "0xa7d3D2CC58e1E82e3ff2C2Cd3B750442522aBbfb",
+            "tranche_id": 11,
+            "tx": "0xf7ad77b4bb44e24178d182db393ace12f22021706d6583d438b285621eaf8b01"
+          }
+        ],
+        "total_tokens": "200",
+        "withdrawn_tokens": "200",
+        "remaining_tokens": "0"
+      },
      {
        "address": "0x6ebf587df7C5C5eb49BB570c240563a98E1b8f4f",
        "deposits": [
@@ -31034,17 +30881,10 @@
            "tx": "0xee0be2716f9467edff80ca7225263c95e69db8d7f020655ab3621b0966d0a311"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "12",
-            "user": "0xa10aD7E7712617fc4ABe0811D8a30fD96cE48F9f",
-            "tranche_id": 11,
-            "tx": "0x7ffe3e795b50a8449052143a739d53aec81c2f53c7981f31496b8c121bd4ec81"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "12",
-        "withdrawn_tokens": "12",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "12"
      },
      {
        "address": "0x804dEbc8807aEe993a727B37d81D7A379DA59fE6",
@@ -31470,17 +31310,10 @@
            "tx": "0xaa605daf521cdcdbbc1d6942a69e1efc86eac89d5804e05f088bce2fabe3d52a"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "10",
-            "user": "0xa2920abaA03b696C7B90486600D578b455E11609",
-            "tranche_id": 11,
-            "tx": "0xc454f6f2572533714b74636b4243ba8fd5456a6f67ef8b93051588b156ab2093"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "10",
-        "withdrawn_tokens": "10",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "10"
      },
      {
        "address": "0xA2B5F0114E7935EFcBd7c038d789Bfa71f2Bfe5D",
@@ -33295,7 +33128,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "442882.3484327902809",
-    "locked_amount": "1033104.123341510407167357286",
+    "locked_amount": "1049422.081232611329856667873",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -34586,8 +34419,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "549182.48543502092691952",
-    "locked_amount": "8963008.4753852283836950014010192461651798",
+    "total_removed": "547359.63874938618402952",
+    "locked_amount": "9020870.9063540351013617047345897584630981",
    "deposits": [
      {
        "amount": "16249.93",
@@ -35091,16 +34924,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "856.08784586478614",
-        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
-        "tx": "0x7882fc86536accee89368b825b374eb365ee5f051cb89fb3710c7e2d24b0d29d"
-      },
-      {
-        "amount": "966.75883976995675",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x6c49f9f742a84f7889b90e6f978f3fb1f642ea447f737f348b3fac91716b9717"
-      },
      {
        "amount": "858.360074993579125",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -36684,12 +36507,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "966.75883976995675",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x6c49f9f742a84f7889b90e6f978f3fb1f642ea447f737f348b3fac91716b9717"
-          },
          {
            "amount": "858.360074993579125",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -37778,8 +37595,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "113142.013429259527625",
-        "remaining_tokens": "146856.874070740472375"
+        "withdrawn_tokens": "112175.254589489570875",
+        "remaining_tokens": "147823.632910510429125"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -38000,12 +37817,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "856.08784586478614",
-            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
-            "tranche_id": 2,
-            "tx": "0x7882fc86536accee89368b825b374eb365ee5f051cb89fb3710c7e2d24b0d29d"
-          },
          {
            "amount": "1293.67099136315494",
            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -38206,8 +38017,8 @@
          }
        ],
        "total_tokens": "150551.801",
-        "withdrawn_tokens": "65072.74657224015982",
-        "remaining_tokens": "85479.05442775984018"
+        "withdrawn_tokens": "64216.65872637537368",
+        "remaining_tokens": "86335.14227362462632"
      },
      {
        "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -39932,8 +39743,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "3709441.39326687814680893",
-    "locked_amount": "2553146.968835877717601199418901287",
+    "total_removed": "3708107.46955489707527943",
+    "locked_amount": "2606565.19565117133351441770201319",
    "deposits": [
      {
        "amount": "129284.449",
@@ -40142,11 +39953,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "1333.9237119810715295",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xc8aae35d9d474b83dd5524de9db59f994fd77040397c00a1a4cf30a5c9315826"
-      },
      {
        "amount": "8950.14985089483210984",
        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -42948,12 +42754,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "1333.9237119810715295",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xc8aae35d9d474b83dd5524de9db59f994fd77040397c00a1a4cf30a5c9315826"
-          },
          {
            "amount": "1192.05386354121365675",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -45344,8 +45144,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "296283.340785656990038",
-        "remaining_tokens": "62840.128789343009962"
+        "withdrawn_tokens": "294949.4170736759185085",
+        "remaining_tokens": "64174.0525013240814915"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -46656,7 +46456,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
    "total_removed": "2622261.560853924298939789",
-    "locked_amount": "691860.405151183386025619771012724",
+    "locked_amount": "712966.269636651830718004793872006",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -48550,8 +48350,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "31616.1712341930685",
-    "locked_amount": "163701.253818397273052118746829",
+    "total_removed": "30192.1031304386685",
+    "locked_amount": "166286.92752366611650390355859972",
    "deposits": [
      {
        "amount": "3000",
@@ -55250,21 +55050,6 @@
        "user": "0x83e600Ae7f4cf265C112314839cDA2341198840B",
        "tx": "0x871fbcbfe5c488654b8aff67f1c4afff2f5940ea3eb0cdf165b159bb96ee7ffd"
      },
-      {
-        "amount": "157.9045256224",
-        "user": "0x74Da54F44975a1C224ABb5CAB8e5fc38a268B425",
-        "tx": "0x65f234b1c4da032348199c9b165cdaee8817e428d1bf357309260ac5d33279d5"
-      },
-      {
-        "amount": "1167.346518264",
-        "user": "0x17197a34E926539066de1987d462c996c797b772",
-        "tx": "0xba73b47fe051e5544519f878f34a69a9251494ea5d6a883f308df59c9f0e29c5"
-      },
-      {
-        "amount": "98.817059868",
-        "user": "0x175BEB5A0b07C9FBb640CF8b97352B3F1534E7b3",
-        "tx": "0x40192637adf93f4df1f1e9edb9d5e431e9a18e4642d0d843e1c6f64cba60ba44"
-      },
      {
        "amount": "229.648541348",
        "user": "0x65C13724928ea0AfA68e09c7b70449bB8f6f3Fc8",
@@ -68119,12 +67904,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "98.817059868",
-            "user": "0x175BEB5A0b07C9FBb640CF8b97352B3F1534E7b3",
-            "tranche_id": 5,
-            "tx": "0x40192637adf93f4df1f1e9edb9d5e431e9a18e4642d0d843e1c6f64cba60ba44"
-          },
          {
            "amount": "30.893512176",
            "user": "0x175BEB5A0b07C9FBb640CF8b97352B3F1534E7b3",
@@ -68133,8 +67912,8 @@
          }
        ],
        "total_tokens": "200",
-        "withdrawn_tokens": "129.710572044",
-        "remaining_tokens": "70.289427956"
+        "withdrawn_tokens": "30.893512176",
+        "remaining_tokens": "169.106487824"
      },
      {
        "address": "0xB95C140fB5c6c881eDc32be1e220D2bD5D8f9c36",
@@ -72322,12 +72101,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "157.9045256224",
-            "user": "0x74Da54F44975a1C224ABb5CAB8e5fc38a268B425",
-            "tranche_id": 5,
-            "tx": "0x65f234b1c4da032348199c9b165cdaee8817e428d1bf357309260ac5d33279d5"
-          },
          {
            "amount": "49.4479147616",
            "user": "0x74Da54F44975a1C224ABb5CAB8e5fc38a268B425",
@@ -72336,8 +72109,8 @@
          }
        ],
        "total_tokens": "320",
-        "withdrawn_tokens": "207.352440384",
-        "remaining_tokens": "112.647559616"
+        "withdrawn_tokens": "49.4479147616",
+        "remaining_tokens": "270.5520852384"
      },
      {
        "address": "0xB7D725753a300FeD6D13f3951D890856EF0C6e30",
@@ -75048,17 +74821,10 @@
            "tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "1167.346518264",
-            "user": "0x17197a34E926539066de1987d462c996c797b772",
-            "tranche_id": 5,
-            "tx": "0xba73b47fe051e5544519f878f34a69a9251494ea5d6a883f308df59c9f0e29c5"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "1800",
-        "withdrawn_tokens": "1167.346518264",
-        "remaining_tokens": "632.653481736"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "1800"
      },
      {
        "address": "0x854a6b84ad48645eac476D0D8197f854C06DD79D",
@@ -77036,7 +76802,7 @@
    "tranche_start": "2021-12-05T00:00:00.000Z",
    "tranche_end": "2022-06-05T00:00:00.000Z",
    "total_added": "171288.42",
-    "total_removed": "64226.1049690697989",
+    "total_removed": "64196.1049690697989",
    "locked_amount": "0",
    "deposits": [
      {
@@ -81261,11 +81027,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "30",
-        "user": "0x4A13d4dC5e06ACdA81C011D55a7DaAc332bC5Dbf",
-        "tx": "0x72e95b2e51cae897d2c09ca7294c630fb3b969aea950a53e10158570faee89c7"
-      },
      {
        "amount": "250",
        "user": "0xbd09687340A09BeB0B5EE0D3C2bCa8d78eBF6E63",
@@ -97473,17 +97234,10 @@
            "tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "30",
-            "user": "0x4A13d4dC5e06ACdA81C011D55a7DaAc332bC5Dbf",
-            "tranche_id": 6,
-            "tx": "0x72e95b2e51cae897d2c09ca7294c630fb3b969aea950a53e10158570faee89c7"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "30",
-        "withdrawn_tokens": "30",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "30"
      },
      {
        "address": "0x02e3d96c448d38790151930A39c36273904C1b0B",
@@ -5,12 +5,10 @@ import { Heading } from '../../components/heading';
 import { SplashLoader } from '../../components/splash-loader';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import {
-  withdrawalProvider,
+  useWithdrawals,
  useWithdrawalDialog,
  WithdrawalsTable,
 } from '@vegaprotocol/withdraws';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import type { RouteChildProps } from '../index';

@@ -31,12 +29,7 @@ const Withdrawals = ({ name }: RouteChildProps) => {
 const WithdrawPendingContainer = () => {
  const openWithdrawalDialog = useWithdrawalDialog((state) => state.open);
  const { t } = useTranslation();
-  const { pubKey } = useVegaWallet();
-  const { data, loading, error } = useDataProvider({
-    dataProvider: withdrawalProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
+  const { data, loading, error } = useWithdrawals();

  if (error) {
    return (
@@ -21,21 +21,15 @@ const orderUpdatedAt = 'updatedAt';
 const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
 const txTimeout = Cypress.env('txTimeout');
-const sepoliaUrl = Cypress.env('ETHERSCAN_URL');
-const btcName =
-  'BTC (local)5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c - tBTC';
+const btcName = 'BTC (local)';
 const btcSymbol = 'tBTC';
 const usdcSymbol = 'fUSDC';
 const toastContent = 'toast-content';
 const ordersTab = 'Orders';
 const depositsTab = 'Deposits';
 const toastCloseBtn = 'toast-close';
-const price = '390';
-const size = '0.0005';
-const newPrice = '200';

 // TODO: ensure this test runs only if capsule is running via workflow
-// Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
 describe('capsule', { tags: '@slow' }, () => {
  before(() => {
    cy.createMarket();
@@ -56,8 +50,8 @@ describe('capsule', { tags: '@slow' }, () => {
      marketId: market.id,
      type: Schema.OrderType.TYPE_LIMIT,
      side: Schema.Side.SIDE_BUY,
-      size: size,
-      price: price,
+      size: '0.0005',
+      price: '390',
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
    };
    const rawPrice = removeDecimal(order.price, market.decimalPlaces);
@@ -70,8 +64,7 @@ describe('capsule', { tags: '@slow' }, () => {

    cy.getByTestId(toastContent).should(
      'contain.text',
-      `ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+${order.size} @ ${order.price}.00 ${usdcSymbol}`,
-      { matchCase: false }
+      `ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+0.0005 @ 390.00 ${usdcSymbol}`
    );
    cy.getByTestId(toastCloseBtn).click();
    // orderbook cells are keyed by price level
@@ -82,7 +75,7 @@ describe('capsule', { tags: '@slow' }, () => {
      .should('contain.text', rawSize);

    cy.getByTestId(ordersTab).click();
-    cy.getByTestId('edit', txTimeout).should('contain.text', 'Edit');
+    cy.getByTestId('edit').should('contain.text', 'Edit');
    cy.getByTestId('tab-orders').within(() => {
      cy.get('.ag-center-cols-container')
        .children()
@@ -120,41 +113,35 @@ describe('capsule', { tags: '@slow' }, () => {
          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
        });
    });
-  });
-
-  it('can edit order', function () {
+    //edit order
    cy.getByTestId(ordersTab).click();
    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
-    cy.get('#limitPrice').focus().clear().type(newPrice);
+    cy.get('#limitPrice').focus().clear().type('200');
    cy.getByTestId('edit-order').find('[type="submit"]').click();
    cy.getByTestId(toastContent).should(
      'contain.text',
-      `ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+${size} @ ${price}.00 ${usdcSymbol}+${size} @ ${newPrice}.00 ${usdcSymbol}`,
-      { matchCase: false }
+      `ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+0.0005 @ 200.00 ${usdcSymbol}+0.0005 @ 200.00 ${usdcSymbol}`
    );
    cy.getByTestId(ordersTab).click();
-    cy.getByTestId(toastCloseBtn).click({ multiple: true });
+    cy.getByTestId(toastCloseBtn).click();
    cy.get('.ag-center-cols-container')
      .children()
      .first()
      .within(() => {
        cy.get(`[col-id='${orderPrice}']`).then(($price) => {
-          expect(parseFloat($price.text())).to.equal(parseFloat(newPrice));
+          expect(parseFloat($price.text())).to.equal(parseFloat('200'));
        });
        checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
      });
-  });
-
-  it('can cancel order', function () {
+    //cancel order
    cy.getByTestId(ordersTab).click();
    cy.getByTestId('cancel').first().click();
    cy.getByTestId(toastContent).should(
      'contain.text',
-      `ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+${size} @ ${newPrice}.00 ${usdcSymbol}`,
-      { matchCase: false }
+      `ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+0.0005 @ 200.00 ${usdcSymbol}`
    );
-    cy.getByTestId(toastCloseBtn).click({ multiple: true });
+    cy.getByTestId(toastCloseBtn).click();

    cy.getByTestId('tab-orders')
      .get('.ag-center-cols-container')
@@ -164,10 +151,7 @@ describe('capsule', { tags: '@slow' }, () => {
      .should('contain.text', OrderStatusMapping.STATUS_CANCELLED);
  });

-  it('can deposit', function () {
-    cy.visit('/#/portfolio');
-    cy.get('main[data-testid="/portfolio"]').should('exist');
-
+  it('can deposit and withdrawal', function () {
    // 1001-DEPO-001
    // 1001-DEPO-002
    // 1001-DEPO-003
@@ -176,12 +160,27 @@ describe('capsule', { tags: '@slow' }, () => {
    // 1001-DEPO-007
    // 1001-DEPO-008
    // 1001-DEPO-009
-    // 1001-DEPO-010
+    // 1002-WITH-001
+    // 1002-WITH-006
+    // 1002-WITH-009
+    // 002-WITH-011
+    // 1002-WITH-024
+    // 1002-WITH-012
+    // 1002-WITH-013
+    // 1002-WITH-014
+    // 1002-WITH-015
+    // 1002-WITH-016
+    // 1002-WITH-019
+
+    cy.visit('/#/portfolio');
+    cy.get('main[data-testid="/portfolio"]').should('exist');
+
+    cy.highlight('creating deposit');

    cy.getByTestId(depositsTab).click();
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
-    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
+    cy.get(assetSelectField, txTimeout).select(btcName);
    cy.getByTestId('deposit-approve-submit').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
    cy.get('[data-testid="Return to deposit"]').click();
@@ -189,8 +188,7 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.getByTestId('deposit-submit').click();
    cy.getByTestId(toastContent, txTimeout).should(
      'contain.text',
-      `Transaction confirmedYour transaction has been confirmed.View on EtherscanDeposit 1.00 ${btcSymbol}`,
-      { matchCase: false }
+      `Transaction completedYour transaction has been completedView on EtherscanDeposit 1.00 ${btcSymbol}`
    );
    cy.getByTestId(toastCloseBtn).click();
    cy.getByTestId('Collateral').click();
@@ -198,6 +196,8 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.highlight('deposit verification');

    cy.getByTestId('asset', txTimeout).should('contain.text', btcSymbol);
+    // need to reload page to see deposit history complete
+    cy.reload();
    cy.getByTestId(depositsTab).click();
    cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
@@ -214,29 +214,15 @@ describe('capsule', { tags: '@slow' }, () => {
        cy.get('[col-id="txHash"]')
          .find('a')
          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/tx/0x`);
+          .and('contain', 'https://sepolia.etherscan.io/tx');
      });
-  });

-  it('can withdrawal', function () {
-    // 1002-WITH-001
-    // 1002-WITH-006
-    // 1002-WITH-009
-    // 1002-WITH-011
-    // 1002-WITH-024
-    // 1002-WITH-012
-    // 1002-WITH-013
-    // 1002-WITH-014
-    // 1002-WITH-015
-    // 1002-WITH-016
-    // 1002-WITH-019
+    cy.highlight('creating withdrawals');

    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
-    cy.get(assetSelectField, txTimeout).select(
-      'BTC (local)5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c - tBTC',
-      { force: true }
-    );
+    connectEthereumWallet('Unknown');
+    cy.get(assetSelectField).select(btcName);
    cy.get(amountField).clear().type('1');
    cy.getByTestId('submit-withdrawal').click();
    cy.getByTestId(toastContent, txTimeout).should(
@@ -257,7 +243,7 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.getByTestId('toast-complete-withdrawal').click();
    cy.getByTestId(toastContent, txTimeout).should(
      'contain.text',
-      'Transaction confirmed'
+      'Transaction completed'
    );

    cy.getByTestId('complete-withdrawal', txTimeout).should('not.exist');
@@ -272,28 +258,17 @@ describe('capsule', { tags: '@slow' }, () => {
        cy.get('[col-id="details.receiverAddress"]')
          .find('a')
          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/address/`);
+          .and('contain', 'https://sepolia.etherscan.io/address/');
        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
        cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
        cy.get('[col-id="status"]').should('have.text', 'Completed');
        cy.get('[col-id="txHash"]')
          .find('a')
          .should('have.attr', 'href')
-          .and('contain', `${sepoliaUrl}/tx/0x`);
+          .and('contain', 'https://sepolia.etherscan.io/tx/0x');
      });
  });
-
-  it('deposit - if approved amount is less than deposit: must see that an approval is needed and be prompted to approve more', function () {
-    // 1001-DEPO-006
-
-    cy.getByTestId(depositsTab).click();
-    cy.getByTestId('deposit-button').click();
-    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
-    cy.get(amountField).clear().type('20000000');
-    cy.getByTestId('deposit-approve-submit').should('be.visible');
-  });
 });
-
 function checkIfDataAndTimeOfCreationAndUpdateIsEqual(date: string) {
  cy.get(`[col-id='${date}'] .ag-cell-wrapper`)
    .children('span')
@@ -56,7 +56,6 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
  });

  it('insufficient funds', () => {
-    // 1001-DEPO-005
    // Deposit amount is valid, but less than approved. This will always be the case because our
    // CI wallet wont have approved any assets
    cy.get(amountField)
@@ -454,4 +454,8 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
        );
      });
  });
+  it.skip('tbd for 7003-MORD', () => {
+    // NOT COVERED: must see the reference, offset and direction for each part pegged order - waiting for clarification
+    // NOT COVERED: must see the reference, offset and direction for each part liquidity order order - waiting for clarification
+  });
 });
@@ -1,28 +1,22 @@
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
-import { depositsProvider } from '@vegaprotocol/deposits';
-import { t, useDataProvider } from '@vegaprotocol/react-helpers';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useDeposits } from '@vegaprotocol/deposits';
+import { t } from '@vegaprotocol/react-helpers';

 export const DepositsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, loading, error } = useDataProvider({
-    dataProvider: depositsProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
+  const { deposits, loading, error } = useDeposits();
  const openDepositDialog = useDepositDialog((state) => state.open);

  return (
    <div className="h-full grid grid-rows-[1fr,min-content]">
      <div className="h-full relative">
        <DepositsTable
-          rowData={data || []}
+          rowData={deposits || []}
          noRowsOverlayComponent={() => null}
        />
        <div className="pointer-events-none absolute inset-0">
          <AsyncRenderer
-            data={data}
+            data={deposits}
            loading={loading}
            error={error}
            noDataCondition={(data) => !(data && data.length)}
@@ -1,20 +1,14 @@
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import {
-  withdrawalProvider,
+  useWithdrawals,
  useWithdrawalDialog,
  WithdrawalsTable,
 } from '@vegaprotocol/withdraws';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { t, useDataProvider } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';

 export const WithdrawalsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, loading, error } = useDataProvider({
-    dataProvider: withdrawalProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
+  const { data, loading, error } = useWithdrawals();
  const openWithdrawDialog = useWithdrawalDialog((state) => state.open);

  return (
@@ -170,7 +170,7 @@ export const SelectMarketPopover = ({
          </div>
        ) : (
          <table className="relative text-sm w-full whitespace-nowrap">
-            {pubKey && (positions?.length ?? 0) && (markets?.length ?? 0) ? (
+            {pubKey && (positions?.length ?? 0) > 0 ? (
              <>
                <TableTitle>{t('My markets')}</TableTitle>
                <SelectAllMarketsTableBody
@@ -50,10 +50,10 @@ export type Account = Omit<AccountFieldsFragment, 'market' | 'asset'> & {
 };

 const update = (
-  data: AccountFieldsFragment[] | null,
+  data: AccountFieldsFragment[],
  deltas: AccountEventsSubscription['accounts']
 ) => {
-  return produce(data || [], (draft) => {
+  return produce(data, (draft) => {
    deltas.forEach((delta) => {
      const id = getId(delta);
      const index = draft.findIndex((a) => getId(a) === id);
@@ -73,8 +73,15 @@ const update = (
  });
 };

-const getData = (responseData: AccountsQuery | null): AccountFieldsFragment[] =>
-  removePaginationWrapper(responseData?.party?.accountsConnection?.edges) || [];
+const getData = (
+  responseData: AccountsQuery
+): AccountFieldsFragment[] | null => {
+  return (
+    removePaginationWrapper(responseData.party?.accountsConnection?.edges) ??
+    null
+  );
+};
+
 const getDelta = (
  subscriptionData: AccountEventsSubscription
 ): AccountEventsSubscription['accounts'] => {
@@ -1,4 +1,4 @@
-import type { InMemoryCacheConfig } from '@apollo/client';
+import type { ApolloError, InMemoryCacheConfig } from '@apollo/client';
 import {
  ApolloClient,
  from,
@@ -13,6 +13,7 @@ import { createClient as createWSClient } from 'graphql-ws';
 import { onError } from '@apollo/client/link/error';
 import { RetryLink } from '@apollo/client/link/retry';
 import ApolloLinkTimeout from 'apollo-link-timeout';
+import type { GraphQLErrors } from '@apollo/client/errors';
 import { localLoggerFactory } from '@vegaprotocol/react-helpers';

 const isBrowser = typeof window !== 'undefined';
@@ -109,3 +110,21 @@ export function createClient({
    connectToDevTools,
  });
 }
+
+const isApolloGraphQLError = (
+  error: ApolloError | Error | undefined
+): error is ApolloError => {
+  return !!error && !!(error as ApolloError).graphQLErrors;
+};
+
+const hasNotFoundGraphQLErrors = (errors: GraphQLErrors) => {
+  return errors.some((e) => e.extensions && e.extensions['type'] === NOT_FOUND);
+};
+
+export const isNotFoundGraphQLError = (
+  error: Error | ApolloError | undefined
+) => {
+  return (
+    isApolloGraphQLError(error) && hasNotFoundGraphQLErrors(error.graphQLErrors)
+  );
+};
@@ -6,15 +6,20 @@ import { AssetDocument } from './__generated__/Asset';

 export type Asset = AssetFieldsFragment;

-const getData = (responseData: AssetQuery | null) => {
-  const foundAssets = responseData?.assetsConnection?.edges
+const getData = (responseData: AssetQuery) => {
+  const foundAssets = responseData.assetsConnection?.edges
    ?.filter((e) => Boolean(e?.node))
    .map((e) => e?.node as Asset);
  if (foundAssets && foundAssets?.length > 0) return foundAssets[0];
  return null;
 };

-export const assetProvider = makeDataProvider<AssetQuery, Asset, never, never>({
+export const assetProvider = makeDataProvider<
+  AssetQuery,
+  Asset | null,
+  never,
+  never
+>({
  query: AssetDocument,
  getData,
 });
@@ -16,14 +16,14 @@ export type BuiltinAsset = Omit<Asset, 'source'> & {
  source: BuiltinAssetSource;
 };

-const getData = (responseData: AssetsQuery | null) =>
-  responseData?.assetsConnection?.edges
+const getData = (responseData: AssetsQuery) =>
+  responseData.assetsConnection?.edges
    ?.filter((e) => Boolean(e?.node))
    .map((e) => e?.node as Asset) ?? [];

 export const assetsProvider = makeDataProvider<
  AssetsQuery,
-  Asset[],
+  Asset[] | null,
  never,
  never
 >({
@@ -48,7 +48,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
                      signers: [
                        {
                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
+                            key: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
                          },
                        },
                      ],
@@ -74,7 +74,6 @@ export const DealTicket = ({ market, submit }: DealTicketProps) => {

  usePersistedOrderStoreSubscription(market.id, (storedOrder) => {
    if (order.price !== storedOrder.price) {
-      clearErrors('price');
      setValue('price', storedOrder.price);
    }
  });
@@ -1,49 +0,0 @@
-import uniqBy from 'lodash/uniqBy';
-import orderBy from 'lodash/orderBy';
-import {
-  getEvents,
-  makeDataProvider,
-  removePaginationWrapper,
-} from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
-import {
-  DepositsDocument,
-  DepositEventDocument,
-} from './__generated__/Deposit';
-import type {
-  DepositFieldsFragment,
-  DepositsQuery,
-  DepositEventSubscription,
-  DepositEventSubscriptionVariables,
-} from './__generated__/Deposit';
-
-export const depositsProvider = makeDataProvider<
-  DepositsQuery,
-  DepositFieldsFragment[],
-  DepositEventSubscription,
-  DepositEventSubscription,
-  DepositEventSubscriptionVariables
->({
-  query: DepositsDocument,
-  subscriptionQuery: DepositEventDocument,
-  getData: (data: DepositsQuery | null) =>
-    orderBy(
-      removePaginationWrapper(data?.party?.depositsConnection?.edges || []),
-      ['createdTimestamp'],
-      ['desc']
-    ),
-  getDelta: (data: DepositEventSubscription) => data,
-  update: (
-    data: DepositFieldsFragment[] | null,
-    delta: DepositEventSubscription
-  ) => {
-    if (!delta.busEvents?.length) {
-      return data;
-    }
-    const incoming = getEvents<DepositFieldsFragment>(
-      Schema.BusEventType.Deposit,
-      delta.busEvents
-    );
-    return uniqBy([...incoming, ...(data || [])], 'id');
-  },
-});
@@ -5,7 +5,7 @@ export * from './deposit-limits';
 export * from './deposit-manager';
 export * from './deposits-table';
 export * from './use-deposit-balances';
-export * from './deposits-provider';
+export * from './use-deposits';
 export * from './use-get-allowance';
 export * from './use-get-balance-of-erc20-token';
 export * from './use-get-deposit-maximum';
@@ -0,0 +1,100 @@
+import uniqBy from 'lodash/uniqBy';
+import orderBy from 'lodash/orderBy';
+import { getNodes, getEvents } from '@vegaprotocol/react-helpers';
+import type { UpdateQueryFn } from '@apollo/client/core/watchQueryOptions';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useEffect, useMemo } from 'react';
+import * as Schema from '@vegaprotocol/types';
+import {
+  useDepositsQuery,
+  DepositEventDocument,
+} from './__generated__/Deposit';
+import type {
+  DepositFieldsFragment,
+  DepositsQuery,
+  DepositEventSubscription,
+  DepositEventSubscriptionVariables,
+} from './__generated__/Deposit';
+
+export const useDeposits = () => {
+  const { pubKey } = useVegaWallet();
+  const { data, loading, error, subscribeToMore } = useDepositsQuery({
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+
+  const deposits = useMemo(() => {
+    if (!data?.party?.depositsConnection?.edges?.length) {
+      return [];
+    }
+
+    return orderBy(
+      getNodes<DepositFieldsFragment>(data.party?.depositsConnection),
+      ['createdTimestamp'],
+      ['desc']
+    );
+  }, [data]);
+
+  useEffect(() => {
+    if (!pubKey) return;
+
+    const unsub = subscribeToMore<
+      DepositEventSubscription,
+      DepositEventSubscriptionVariables
+    >({
+      document: DepositEventDocument,
+      variables: { partyId: pubKey },
+      updateQuery,
+    });
+
+    return () => {
+      unsub();
+    };
+  }, [pubKey, subscribeToMore]);
+
+  return { data, loading, error, deposits };
+};
+
+const updateQuery: UpdateQueryFn<
+  DepositsQuery,
+  DepositEventSubscriptionVariables,
+  DepositEventSubscription
+> = (prev, { subscriptionData, variables }) => {
+  if (!subscriptionData.data.busEvents?.length || !variables?.partyId) {
+    return prev;
+  }
+
+  const curr = getNodes<DepositFieldsFragment>(prev.party?.depositsConnection);
+  const incoming = getEvents<DepositFieldsFragment>(
+    Schema.BusEventType.Deposit,
+    subscriptionData.data.busEvents
+  );
+
+  const deposits = uniqBy([...incoming, ...curr], 'id');
+
+  if (!prev.party) {
+    return {
+      ...prev,
+      party: {
+        __typename: 'Party',
+        id: variables?.partyId,
+        depositsConnection: {
+          __typename: 'DepositsConnection',
+          edges: deposits.map((d) => ({ __typename: 'DepositEdge', node: d })),
+        },
+      },
+    };
+  }
+
+  return {
+    ...prev,
+    party: {
+      ...prev.party,
+      id: variables?.partyId,
+      depositsConnection: {
+        __typename: 'DepositsConnection',
+        edges: deposits.map((d) => ({ __typename: 'DepositEdge', node: d })),
+      },
+    },
+  };
+};
@@ -59,8 +59,8 @@ const update = (
 export type Trade = Omit<FillFieldsFragment, 'market'> & { market?: Market };
 export type TradeEdge = Edge<Trade>;

-const getData = (responseData: FillsQuery | null): FillEdgeFragment[] =>
-  responseData?.party?.tradesConnection?.edges || [];
+const getData = (responseData: FillsQuery): FillEdgeFragment[] =>
+  responseData.party?.tradesConnection?.edges || [];

 const getPageInfo = (responseData: FillsQuery): PageInfo | null =>
  responseData.party?.tradesConnection?.pageInfo || null;
@@ -5,8 +5,8 @@ import type {
 } from './__generated__/Proposals';
 import { ProposalsListDocument } from './__generated__/Proposals';

-const getData = (responseData: ProposalsListQuery | null) =>
-  responseData?.proposalsConnection?.edges
+const getData = (responseData: ProposalsListQuery) =>
+  responseData.proposalsConnection?.edges
    ?.filter((edge) => Boolean(edge?.node))
    .map((edge) => edge?.node as ProposalListFieldsFragment) || null;

@@ -35,12 +35,12 @@ export type LedgerEntry = LedgerEntryFragment & {

 export type AggregatedLedgerEntriesEdge = Schema.AggregatedLedgerEntriesEdge;

-const getData = (responseData: LedgerEntriesQuery | null) => {
-  return responseData?.ledgerEntries?.edges || [];
+const getData = (responseData: LedgerEntriesQuery) => {
+  return responseData.ledgerEntries?.edges || [];
 };

 export const update = (
-  data: ReturnType<typeof getData> | null,
+  data: ReturnType<typeof getData>,
  delta: ReturnType<typeof getData>,
  reload: () => void,
  variables?: LedgerEntriesQueryVariables
@@ -35,10 +35,10 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
  query: LiquidityProvisionsDocument,
  subscriptionQuery: LiquidityProvisionsUpdateDocument,
  update: (
-    data: LiquidityProvisionFieldsFragment[] | null,
+    data: LiquidityProvisionFieldsFragment[],
    deltas: LiquidityProvisionsUpdateSubscription['liquidityProvisions']
  ) => {
-    return produce(data || [], (draft) => {
+    return produce(data, (draft) => {
      deltas?.forEach((delta) => {
        const id = getId(delta);
        const index = draft.findIndex((a) => getId(a) === id);
@@ -63,9 +63,9 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
      });
    });
  },
-  getData: (responseData: LiquidityProvisionsQuery | null) => {
+  getData: (responseData: LiquidityProvisionsQuery) => {
    return (
-      responseData?.market?.liquidityProvisionsConnection?.edges?.map(
+      responseData.market?.liquidityProvisionsConnection?.edges?.map(
        (e) => e?.node
      ) ?? []
    ).filter((e) => !!e) as LiquidityProvisionFieldsFragment[];
@@ -105,7 +105,7 @@ export const marketLiquidityDataProvider = makeDataProvider<
  never
 >({
  query: MarketLpDocument,
-  getData: (responseData: MarketLpQuery | null) => {
+  getData: (responseData: MarketLpQuery) => {
    return responseData;
  },
 });
@@ -119,10 +119,10 @@ export const liquidityFeeShareDataProvider = makeDataProvider<
  query: LiquidityProviderFeeShareDocument,
  subscriptionQuery: LiquidityProviderFeeShareUpdateDocument,
  update: (
-    data: LiquidityProviderFeeShareFieldsFragment[] | null,
+    data: LiquidityProviderFeeShareFieldsFragment[],
    deltas: LiquidityProviderFeeShareUpdateSubscription['marketsData'][0]['liquidityProviderFeeShare']
  ) => {
-    return produce(data || [], (draft) => {
+    return produce(data, (draft) => {
      deltas?.forEach((delta) => {
        const id = delta.partyId;
        const index = draft.findIndex((a) => a.party.id === id);
@@ -143,7 +143,7 @@ export const liquidityFeeShareDataProvider = makeDataProvider<
    });
  },
  getData: (data) => {
-    return data?.market?.data?.liquidityProviderFeeShare || [];
+    return data.market?.data?.liquidityProviderFeeShare || [];
  },
  getDelta: (subscriptionData: LiquidityProviderFeeShareUpdateSubscription) => {
    return subscriptionData.marketsData[0].liquidityProviderFeeShare;
@@ -58,7 +58,7 @@ export interface Markets {
 }

 const getData = (
-  responseData: LiquidityProvisionMarketsQuery | null
+  responseData: LiquidityProvisionMarketsQuery
 ): LiquidityProvisionMarket[] | null => {
  return (
    responseData?.marketsConnection?.edges.map((edge) => {
@@ -53,7 +53,7 @@ export const update: Update<
  return data;
 };

-const getData = (responseData: MarketDepthQuery | null) => responseData?.market;
+const getData = (responseData: MarketDepthQuery) => responseData.market;

 const getDelta = (subscriptionData: MarketDepthUpdateSubscription) =>
  subscriptionData.marketsDepthUpdate;
@@ -9,5 +9,5 @@ export const marketInfoDataProvider = makeDataProvider<
  never
 >({
  query: MarketInfoDocument,
-  getData: (responseData: MarketInfoQuery | null) => responseData,
+  getData: (responseData: MarketInfoQuery) => responseData,
 });
@@ -24,7 +24,7 @@ export const update = (data: Candle[] | null, delta: Candle) => {
  return [delta];
 };

-const getData = (responseData: MarketCandlesQuery | null): Candle[] | null =>
+const getData = (responseData: MarketCandlesQuery): Candle[] | null =>
  responseData?.marketsConnection?.edges[0]?.node.candlesConnection?.edges
    ?.filter((edge) => edge?.node)
    .map((edge) => edge?.node as Candle) || null;
@@ -18,20 +18,14 @@ import type {

 export type MarketData = MarketDataFieldsFragment;

-const update = (
-  data: MarketData | null,
-  delta: MarketDataUpdateFieldsFragment
-) => {
-  return (
-    data &&
-    produce(data, (draft) => {
-      const { marketId, __typename, ...marketData } = delta;
-      Object.assign(draft, marketData);
-    })
-  );
+const update = (data: MarketData, delta: MarketDataUpdateFieldsFragment) => {
+  return produce(data, (draft) => {
+    const { marketId, __typename, ...marketData } = delta;
+    Object.assign(draft, marketData);
+  });
 };

-const getData = (responseData: MarketDataQuery | null): MarketData | null =>
+const getData = (responseData: MarketDataQuery): MarketData | null =>
  responseData?.marketsConnection?.edges[0].node.data || null;

 const getDelta = (
@@ -11,7 +11,7 @@ import type { MarketData } from './market-data-provider';
 import { marketDataProvider } from './market-data-provider';

 const getData = (
-  responseData: MarketQuery | null
+  responseData: MarketQuery
 ): SingleMarketFieldsFragment | null => responseData?.market || null;

 export const marketProvider = makeDataProvider<
@@ -8,9 +8,7 @@ export interface MarketCandles {
  candles: Candle[] | undefined;
 }

-const getData = (
-  responseData: MarketsCandlesQuery | null
-): MarketCandles[] | null =>
+const getData = (responseData: MarketsCandlesQuery): MarketCandles[] | null =>
  responseData?.marketsConnection?.edges.map((edge) => ({
    marketId: edge.node.id,
    candles: edge.node.candlesConnection?.edges
@@ -3,8 +3,8 @@ import type { MarketsDataQuery } from './__generated__/markets-data';
 import { MarketsDataDocument } from './__generated__/markets-data';
 import type { MarketData } from './market-data-provider';

-const getData = (responseData: MarketsDataQuery | null): MarketData[] | null =>
-  responseData?.marketsConnection?.edges
+const getData = (responseData: MarketsDataQuery): MarketData[] | null =>
+  responseData.marketsConnection?.edges
    .filter((edge) => edge.node.data)
    .map((edge) => edge.node.data as MarketData) || null;

@@ -21,7 +21,7 @@ import type { Candle } from './market-candles-provider';

 export type Market = MarketFieldsFragment;

-const getData = (responseData: MarketsQuery | null): Market[] | null =>
+const getData = (responseData: MarketsQuery): Market[] | null =>
  responseData?.marketsConnection?.edges.map((edge) => edge.node) || null;

 export const marketsProvider = makeDataProvider<
@@ -62,7 +62,7 @@ describe('order data provider', () => {
    expect(updatedData && updatedData[1].node.updatedAt).toEqual(
      delta[4].updatedAt
    );
-    expect(update([], delta, () => null, { partyId: '0x123' })?.length).toEqual(
+    expect(update([], delta, () => null, { partyId: '0x123' }).length).toEqual(
      4
    );
  });
@@ -71,7 +71,7 @@ const orderMatchFilters = (
  return true;
 };

-const getData = (responseData: OrdersQuery | null) =>
+const getData = (responseData: OrdersQuery) =>
  responseData?.party?.ordersConnection?.edges || [];

 const getDelta = (subscriptionData: OrdersUpdateSubscription) =>
@@ -81,7 +81,7 @@ const getPageInfo = (responseData: OrdersQuery): PageInfo | null =>
  responseData.party?.ordersConnection?.pageInfo || null;

 export const update = (
-  data: ReturnType<typeof getData> | null,
+  data: ReturnType<typeof getData>,
  delta: ReturnType<typeof getDelta>,
  reload: () => void,
  variables?: OrdersQueryVariables
@@ -14,10 +14,10 @@ import type {
 } from './__generated__/Positions';

 const update = (
-  data: MarginFieldsFragment[] | null,
+  data: MarginFieldsFragment[],
  delta: MarginsSubscriptionSubscription['margins']
 ) => {
-  return produce(data || [], (draft) => {
+  return produce(data, (draft) => {
    const { marketId } = delta;
    const index = draft.findIndex((node) => node.market.id === marketId);
    if (index !== -1) {
@@ -49,9 +49,8 @@ const update = (
  });
 };

-const getData = (responseData: MarginsQuery | null) =>
-  removePaginationWrapper(responseData?.party?.marginsConnection?.edges) || [];
-
+const getData = (responseData: MarginsQuery) =>
+  removePaginationWrapper(responseData.party?.marginsConnection?.edges) || [];
 const getDelta = (subscriptionData: MarginsSubscriptionSubscription) =>
  subscriptionData.margins;

@@ -4,8 +4,8 @@ import BigNumber from 'bignumber.js';
 import sortBy from 'lodash/sortBy';
 import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
+import { toBigNum } from '@vegaprotocol/react-helpers';
 import {
-  toBigNum,
  makeDataProvider,
  makeDerivedDataProvider,
  removePaginationWrapper,
@@ -171,10 +171,10 @@ export const getMetrics = (
 };

 export const update = (
-  data: PositionFieldsFragment[] | null,
+  data: PositionFieldsFragment[],
  deltas: PositionsSubscriptionSubscription['positions']
 ) => {
-  return produce(data || [], (draft) => {
+  return produce(data, (draft) => {
    deltas.forEach((delta) => {
      const index = draft.findIndex(
        (node) => node.market.id === delta.marketId
@@ -212,8 +212,8 @@ export const positionsDataProvider = makeDataProvider<
  query: PositionsDocument,
  subscriptionQuery: PositionsSubscriptionDocument,
  update,
-  getData: (responseData: PositionsQuery | null) =>
-    removePaginationWrapper(responseData?.party?.positionsConnection?.edges) ||
+  getData: (responseData: PositionsQuery) =>
+    removePaginationWrapper(responseData.party?.positionsConnection?.edges) ||
    [],
  getDelta: (subscriptionData: PositionsSubscriptionSubscription) =>
    subscriptionData.positions,
@@ -172,33 +172,3 @@ it('displays realised and unrealised PNL', async () => {
  expect(cells[9].textContent).toEqual('1.23');
  expect(cells[10].textContent).toEqual('4.56');
 });
-
-it('displays close button', async () => {
-  await act(async () => {
-    render(
-      <PositionsTable
-        rowData={singleRowData}
-        onClose={() => {
-          return;
-        }}
-      />
-    );
-  });
-  const cells = screen.getAllByRole('gridcell');
-  expect(cells[12].textContent).toEqual('Close');
-});
-
-it('do not display close button if openVolume is zero', async () => {
-  await act(async () => {
-    render(
-      <PositionsTable
-        rowData={[{ ...singleRow, openVolume: '0' }]}
-        onClose={() => {
-          return;
-        }}
-      />
-    );
-  });
-  const cells = screen.getAllByRole('gridcell');
-  expect(cells[12].textContent).toEqual('');
-});
@@ -381,16 +381,14 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
        {onClose ? (
          <AgGridColumn
            type="rightAligned"
-            cellRenderer={({ data }: VegaICellRendererParams<Position>) =>
-              data?.openVolume && data?.openVolume !== '0' ? (
-                <ButtonLink
-                  data-testid="close-position"
-                  onClick={() => data && onClose(data)}
-                >
-                  {t('Close')}
-                </ButtonLink>
-              ) : null
-            }
+            cellRenderer={({ data }: VegaICellRendererParams<Position>) => (
+              <ButtonLink
+                data-testid="close-position"
+                onClick={() => data && onClose(data)}
+              >
+                {t('Close')}
+              </ButtonLink>
+            )}
          />
        ) : null}
      </AgGrid>
@@ -2,7 +2,10 @@ import { useCallback, useState } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { positionsDataProvider } from './positions-data-providers';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type { PositionFieldsFragment } from './__generated__/Positions';
+import type {
+  PositionFieldsFragment,
+  PositionsSubscriptionSubscription,
+} from './__generated__/Positions';

 export const useMarketPositionOpenVolume = (marketId: string) => {
  const { pubKey } = useVegaWallet();
@@ -18,7 +21,10 @@ export const useMarketPositionOpenVolume = (marketId: string) => {
    [setOpenVolume, marketId]
  );

-  useDataProvider({
+  useDataProvider<
+    PositionFieldsFragment[],
+    PositionsSubscriptionSubscription['positions']
+  >({
    dataProvider: positionsDataProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey || !marketId,
@@ -1,2 +1,20 @@
 export * from './hooks';
-export * from './lib';
+export * from './lib/format';
+export * from './lib/generic-data-provider';
+export * from './lib/get-nodes';
+export * from './lib/get-events';
+export * from './lib/grid';
+export * from './lib/i18n';
+export * from './lib/pagination';
+export * from './lib/ag-grid-update';
+export * from './lib/remove-0x';
+export * from './lib/storage';
+export * from './lib/time';
+export * from './lib/validate';
+export * from './lib/links';
+export * from './lib/is-asset-erc20';
+export * from './lib/remove-pagination-wrapper';
+export * from './lib/__generated__/ChainId';
+export * from './lib/data-grid';
+export * from './lib/local-logger';
+export * from './lib/market-expires';
@@ -1,29 +0,0 @@
-import type { ApolloError } from '@apollo/client';
-import type { GraphQLErrors } from '@apollo/client/errors';
-
-const NOT_FOUND = 'NotFound';
-
-const isApolloGraphQLError = (
-  error: ApolloError | Error | undefined
-): error is ApolloError => {
-  return !!error && !!(error as ApolloError).graphQLErrors;
-};
-
-const hasNotFoundGraphQLErrors = (errors: GraphQLErrors, path?: string) => {
-  return errors.some(
-    (e) =>
-      e.extensions &&
-      e.extensions['type'] === NOT_FOUND &&
-      (!path || e.path?.[0] === path)
-  );
-};
-
-export const isNotFoundGraphQLError = (
-  error: Error | ApolloError | undefined,
-  path?: string
-) => {
-  return (
-    isApolloGraphQLError(error) &&
-    hasNotFoundGraphQLErrors(error.graphQLErrors, path)
-  );
-};
@@ -62,7 +62,7 @@ const subscribe = makeDataProvider<QueryData, Data, SubscriptionData, Delta>({
  query,
  subscriptionQuery,
  update,
-  getData: (r) => r?.data || null,
+  getData: (r) => r.data,
  getDelta: (r) => r.data,
 });

@@ -91,7 +91,7 @@ const paginatedSubscribe = makeDataProvider<
  query,
  subscriptionQuery,
  update,
-  getData: (r) => r?.data || null,
+  getData: (r) => r.data,
  getDelta: (r) => r.data,
  pagination: {
    first,
@@ -215,7 +215,7 @@ describe('data provider', () => {
    const subscription = subscribe(callback, client);
    await resolveQuery({ data });
    const delta: Item[] = [];
-    update.mockImplementationOnce((data, delta) => [...(data || []), ...delta]);
+    update.mockImplementationOnce((data, delta) => [...data, ...delta]);
    // calling onNext from client.subscribe({ query }).subscribe(onNext)
    await clientSubscribeSubscribe.mock.calls[
      clientSubscribeSubscribe.mock.calls.length - 1
@@ -234,7 +234,7 @@ describe('data provider', () => {
    const subscription = subscribe(callback, client);
    await resolveQuery({ data });
    const delta: Item[] = [];
-    update.mockImplementationOnce((data, delta) => data || []);
+    update.mockImplementationOnce((data, delta) => data);
    const callbackCallsLength = callback.mock.calls.length;
    // calling onNext from client.subscribe({ query }).subscribe(onNext)
    await clientSubscribeSubscribe.mock.calls[
@@ -591,7 +591,7 @@ describe('derived data provider', () => {
    await resolveQuery({ data: part2 });
    expect(combineData).toBeCalledTimes(1);
    expect(callback).toBeCalledTimes(1);
-    update.mockImplementation((data, delta) => [...(data || []), ...delta]);
+    update.mockImplementation((data, delta) => [...data, ...delta]);
    combineData.mockReturnValueOnce({ ...data });
    const combinedDelta = {};
    combineDelta.mockReturnValueOnce(combinedDelta);
@@ -629,7 +629,7 @@ describe('derived data provider', () => {
    await resolveQuery({ data: [] });
    expect(combineData).toBeCalledTimes(1);
    expect(callback).toBeCalledTimes(1);
-    update.mockImplementation((data, delta) => [...(data || []), ...delta]);
+    update.mockImplementation((data, delta) => [...data, ...delta]);
    combineData.mockReturnValueOnce({ ...data });
    const combinedInsertionData = {};
    combineInsertionData.mockReturnValueOnce(combinedInsertionData);
@@ -8,7 +8,6 @@ import type {
 } from '@apollo/client';
 import type { Subscription } from 'zen-observable-ts';
 import isEqual from 'lodash/isEqual';
-import { isNotFoundGraphQLError } from './apollo-client';
 import type * as Schema from '@vegaprotocol/types';
 interface UpdateData<Data, Delta> {
  delta?: Delta;
@@ -72,12 +71,7 @@ export interface Update<
  Delta,
  Variables extends OperationVariables = OperationVariables
 > {
-  (
-    data: Data | null,
-    delta: Delta,
-    reload: Reload,
-    variables?: Variables
-  ): Data;
+  (data: Data, delta: Delta, reload: Reload, variables?: Variables): Data;
 }

 export interface Append<Data> {
@@ -94,7 +88,7 @@ export interface Append<Data> {
 }

 interface GetData<QueryData, Data, Variables> {
-  (queryData: QueryData | null, variables?: Variables): Data | null;
+  (queryData: QueryData, variables?: Variables): Data | null;
 }

 interface GetPageInfo<QueryData> {
@@ -166,7 +160,7 @@ interface DataProviderParams<
 > {
  query: Query<QueryData>;
  subscriptionQuery?: Query<SubscriptionData>;
-  update?: Update<Data | null, Delta, Variables>;
+  update?: Update<Data, Delta, Variables>;
  getData: GetData<QueryData, Data, Variables>;
  getDelta?: GetDelta<SubscriptionData, Delta, Variables>;
  pagination?: {
@@ -355,11 +349,6 @@ function makeDataProviderInternal<
      }
      loaded = true;
    } catch (e) {
-      if (isNotFoundGraphQLError(e as Error, 'party')) {
-        data = getData(null, variables);
-        loaded = true;
-        return;
-      }
      // if error will occur data provider stops subscription
      error = e as Error;
      if (subscription) {
@@ -395,7 +384,7 @@ function makeDataProviderInternal<
      return;
    }
    const delta = getDelta(subscriptionData, variables);
-    if (loading) {
+    if (loading || !data) {
      updateQueue.push(delta);
    } else {
      const updatedData = update(data, delta, reload, variables);
@@ -420,6 +409,7 @@ function makeDataProviderInternal<
    if (!client) {
      return;
    }
+
    if (subscriptionQuery && getDelta && update) {
      subscription = client
        .subscribe<SubscriptionData>({
@@ -1,20 +1,16 @@
-export * from './__generated__/ChainId';
-export * from './ag-grid-update';
-export * from './apollo-client';
-export * from './data-grid';
 export * from './format';
-export * from './generic-data-provider';
-export * from './get-events';
-export * from './get-nodes';
 export * from './grid';
+export * from './storage';
+export * from './validate';
+export * from './generic-data-provider';
+export * from './get-nodes';
+export * from './get-events';
 export * from './i18n';
-export * from './is-asset-erc20';
-export * from './links';
-export * from './local-logger';
-export * from './market-expires';
 export * from './pagination';
 export * from './remove-0x';
-export * from './remove-pagination-wrapper';
-export * from './storage';
 export * from './time';
-export * from './validate';
+export * from './links';
+export * from './remove-pagination-wrapper';
+export * from './data-grid';
+export * from './local-logger';
+export * from './market-expires';
@@ -3,7 +3,6 @@ fragment TradeFields on Trade {
  price
  size
  createdAt
-  aggressor
  market {
    id
  }
@@ -36,6 +35,5 @@ subscription TradesUpdate($marketId: ID!) {
    size
    createdAt
    marketId
-    aggressor
  }
 }
@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type TradeFieldsFragment = { __typename?: 'Trade', id: string, price: string, size: string, createdAt: any, aggressor: Types.Side, market: { __typename?: 'Market', id: string } };
+export type TradeFieldsFragment = { __typename?: 'Trade', id: string, price: string, size: string, createdAt: any, market: { __typename?: 'Market', id: string } };

 export type TradesQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
@@ -11,14 +11,14 @@ export type TradesQueryVariables = Types.Exact<{
 }>;


-export type TradesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, tradesConnection?: { __typename?: 'TradeConnection', edges: Array<{ __typename?: 'TradeEdge', cursor: string, node: { __typename?: 'Trade', id: string, price: string, size: string, createdAt: any, aggressor: Types.Side, market: { __typename?: 'Market', id: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } } | null } | null };
+export type TradesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, tradesConnection?: { __typename?: 'TradeConnection', edges: Array<{ __typename?: 'TradeEdge', cursor: string, node: { __typename?: 'Trade', id: string, price: string, size: string, createdAt: any, market: { __typename?: 'Market', id: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } } | null } | null };

 export type TradesUpdateSubscriptionVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
 }>;


-export type TradesUpdateSubscription = { __typename?: 'Subscription', trades?: Array<{ __typename?: 'TradeUpdate', id: string, price: string, size: string, createdAt: any, marketId: string, aggressor: Types.Side }> | null };
+export type TradesUpdateSubscription = { __typename?: 'Subscription', trades?: Array<{ __typename?: 'TradeUpdate', id: string, price: string, size: string, createdAt: any, marketId: string }> | null };

 export const TradeFieldsFragmentDoc = gql`
    fragment TradeFields on Trade {
@@ -26,7 +26,6 @@ export const TradeFieldsFragmentDoc = gql`
  price
  size
  createdAt
-  aggressor
  market {
    id
  }
@@ -90,7 +89,6 @@ export const TradesUpdateDocument = gql`
    size
    createdAt
    marketId
-    aggressor
  }
 }
    `;
@@ -20,7 +20,7 @@ import produce from 'immer';
 export const MAX_TRADES = 50;

 const getData = (
-  responseData: TradesQuery | null
+  responseData: TradesQuery
 ): ({
  cursor: string;
  node: TradeFieldsFragment;
@@ -30,7 +30,7 @@ const getDelta = (subscriptionData: TradesUpdateSubscription) =>
  subscriptionData?.trades || [];

 const update = (
-  data: ReturnType<typeof getData> | null,
+  data: ReturnType<typeof getData>,
  delta: ReturnType<typeof getDelta>
 ) => {
  return produce(data, (draft) => {
@@ -1,15 +1,13 @@
 import { act, render, screen } from '@testing-library/react';
 import { getDateTimeFormat } from '@vegaprotocol/react-helpers';
-import { SELL_CLASS, TradesTable, BUY_CLASS } from './trades-table';
+import { DOWN_CLASS, TradesTable, UP_CLASS } from './trades-table';
 import type { Trade } from './trades-data-provider';
-import { Side } from '@vegaprotocol/types';

 const trade: Trade = {
  __typename: 'Trade',
  id: 'trade-id',
  price: '111122200',
  size: '2000',
-  aggressor: Side.SIDE_BUY,
  createdAt: new Date('2022-04-06T19:00:00').toISOString(),
  market: {
    __typename: 'Market',
@@ -19,58 +17,59 @@ const trade: Trade = {
  } as Trade['market'],
 };

-describe('TradesTable', () => {
-  it('should render correct columns', async () => {
-    await act(async () => {
-      render(<TradesTable rowData={[trade]} />);
-    });
-    const expectedHeaders = ['Price', 'Size', 'Created at'];
-    const headers = screen.getAllByRole('columnheader');
-    expect(headers).toHaveLength(expectedHeaders.length);
-    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
+it('Correct columns are rendered', async () => {
+  await act(async () => {
+    render(<TradesTable rowData={[trade]} />);
+  });
+  const expectedHeaders = ['Price', 'Size', 'Created at'];
+  const headers = screen.getAllByRole('columnheader');
+  expect(headers).toHaveLength(expectedHeaders.length);
+  expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
+});
+
+it('Number and data columns are formatted', async () => {
+  await act(async () => {
+    render(<TradesTable rowData={[trade]} />);
  });

-  it('should format number and data columns', async () => {
-    await act(async () => {
-      render(<TradesTable rowData={[trade]} />);
-    });
-
-    const cells = screen.getAllByRole('gridcell');
-    const expectedValues = [
-      '1,111,222.00',
-      '20.00',
-      getDateTimeFormat().format(new Date(trade.createdAt)),
-    ];
-    cells.forEach((cell, i) => {
-      expect(cell).toHaveTextContent(expectedValues[i]);
-    });
-  });
-
-  it('should format price and size columns', async () => {
-    const trade2 = {
-      ...trade,
-      id: 'trade-id-2',
-      price: (Number(trade.price) + 10).toString(),
-      size: (Number(trade.size) - 10).toString(),
-    };
-    await act(async () => {
-      render(<TradesTable rowData={[trade2, trade]} />);
-    });
-
-    const cells = screen.getAllByRole('gridcell');
-
-    const priceCells = cells.filter(
-      (cell) => cell.getAttribute('col-id') === 'price'
-    );
-    const sizeCells = cells.filter(
-      (cell) => cell.getAttribute('col-id') === 'size'
-    );
-
-    // For first trade price should have green class
-    // row 1
-    expect(priceCells[0]).toHaveClass(BUY_CLASS);
-    expect(priceCells[1]).not.toHaveClass(SELL_CLASS);
-    expect(sizeCells[1]).not.toHaveClass(SELL_CLASS);
-    expect(sizeCells[1]).not.toHaveClass(BUY_CLASS);
+  const cells = screen.getAllByRole('gridcell');
+  const expectedValues = [
+    '1,111,222.00',
+    '20.00',
+    getDateTimeFormat().format(new Date(trade.createdAt)),
+  ];
+  cells.forEach((cell, i) => {
+    expect(cell).toHaveTextContent(expectedValues[i]);
  });
 });
+
+it('Price and size columns are formatted', async () => {
+  const trade2 = {
+    ...trade,
+    id: 'trade-id-2',
+    price: (Number(trade.price) + 10).toString(),
+    size: (Number(trade.size) - 10).toString(),
+  };
+  await act(async () => {
+    render(<TradesTable rowData={[trade2, trade]} />);
+  });
+
+  const cells = screen.getAllByRole('gridcell');
+
+  const priceCells = cells.filter(
+    (cell) => cell.getAttribute('col-id') === 'price'
+  );
+  const sizeCells = cells.filter(
+    (cell) => cell.getAttribute('col-id') === 'size'
+  );
+
+  // For first trade price should have green class and size should have red class
+  // row 1
+  expect(priceCells[0]).toHaveClass(UP_CLASS);
+  expect(priceCells[1]).not.toHaveClass(DOWN_CLASS);
+  expect(priceCells[1]).not.toHaveClass(UP_CLASS);
+
+  expect(sizeCells[0]).toHaveClass(DOWN_CLASS);
+  expect(sizeCells[1]).not.toHaveClass(DOWN_CLASS);
+  expect(sizeCells[1]).not.toHaveClass(UP_CLASS);
+});
@@ -13,22 +13,31 @@ import type { IDatasource, IGetRowsParams } from 'ag-grid-community';
 import type { CellClassParams, ValueFormatterParams } from 'ag-grid-community';
 import type { AgGridReactProps } from 'ag-grid-react';
 import type { Trade } from './trades-data-provider';
-import { Side } from '@vegaprotocol/types';
+import BigNumber from 'bignumber.js';

-export const BUY_CLASS = 'text-vega-green dark:text-vega-green';
-export const SELL_CLASS = 'text-vega-pink dark:text-vega-pink';
+export const UP_CLASS = 'text-vega-green dark:text-vega-green';
+export const DOWN_CLASS = 'text-vega-pink dark:text-vega-pink';

-const changeCellClass = ({ node }: CellClassParams) => {
-  let colorClass = '';
+const changeCellClass =
+  (dataKey: string) =>
+  ({ api, value, node }: CellClassParams) => {
+    const rowIndex = node?.rowIndex;
+    let colorClass = '';

-  if (node.data?.aggressor === Side.SIDE_BUY) {
-    colorClass = BUY_CLASS;
-  } else if (node.data?.aggressor === Side.SIDE_SELL) {
-    colorClass = SELL_CLASS;
-  }
+    if (typeof rowIndex === 'number') {
+      const prevRowNode = api.getModel().getRow(rowIndex + 1);
+      const prevValue = prevRowNode?.data && prevRowNode.data[dataKey];
+      const valueNum = new BigNumber(value);

-  return ['font-mono text-right', colorClass].join(' ');
-};
+      if (valueNum.isGreaterThan(prevValue)) {
+        colorClass = UP_CLASS;
+      } else if (valueNum.isLessThan(prevValue)) {
+        colorClass = DOWN_CLASS;
+      }
+    }
+
+    return ['font-mono text-right', colorClass].join(' ');
+  };

 export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: (Trade | null)[], lastRow?: number): void;
@@ -68,7 +77,7 @@ export const TradesTable = forwardRef<AgGridReact, Props>((props, ref) => {
        field="price"
        type="rightAligned"
        width={130}
-        cellClass={changeCellClass}
+        cellClass={changeCellClass('price')}
        valueFormatter={({
          value,
          data,
@@ -118,6 +127,7 @@ export const TradesTable = forwardRef<AgGridReact, Props>((props, ref) => {
          }
          return addDecimal(value, data.market.positionDecimalPlaces);
        }}
+        cellClass={changeCellClass('size')}
      />
      <AgGridColumn
        headerName={t('Created at')}
@@ -1,4 +1,3 @@
-import { Side } from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 import type {
@@ -48,7 +47,6 @@ export const tradesUpdateSubscription = (
        size: '24',
        createdAt: '2022-04-06T16:19:42.692598951Z',
        marketId: 'market-0',
-        aggressor: Side.SIDE_BUY,
      },
    ],
  };
@@ -61,7 +59,6 @@ const trades: TradeFieldsFragment[] = [
    price: '17116898',
    size: '24',
    createdAt: '2022-04-06T16:19:42.692598951Z',
-    aggressor: Side.SIDE_BUY,
    market: {
      id: 'market-0',
      __typename: 'Market',
@@ -73,7 +70,6 @@ const trades: TradeFieldsFragment[] = [
    price: '17209102',
    size: '7',
    createdAt: '2022-04-07T06:59:44.835686754Z',
-    aggressor: Side.SIDE_SELL,
    market: {
      id: 'market-0',
      __typename: 'Market',
@@ -85,7 +81,6 @@ const trades: TradeFieldsFragment[] = [
    price: '17106734',
    size: '18',
    createdAt: '2022-04-07T17:56:47.997938583Z',
-    aggressor: Side.SIDE_BUY,
    market: {
      id: 'market-0',
      __typename: 'Market',
@@ -1,6 +1,7 @@
 import { Splash } from '../splash';
 import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
+import { isNotFoundGraphQLError } from '@vegaprotocol/apollo-client';

 interface AsyncRendererProps<T> {
  loading: boolean;
@@ -25,7 +26,7 @@ export function AsyncRenderer<T = object>({
  children,
  render,
 }: AsyncRendererProps<T>) {
-  if (error) {
+  if (error && !isNotFoundGraphQLError(error)) {
    return (
      <Splash>
        {errorMessage
@@ -9,7 +9,6 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { VegaWalletProvider } from '../provider';
 import { VegaConnectDialog, CLOSE_DELAY } from './connect-dialog';
-import type { VegaWalletDialogStore } from './connect-dialog';
 import type { VegaConnectDialogProps } from '..';
 import {
  ClientErrors,
@@ -24,15 +23,13 @@ import { ChainIdDocument } from '@vegaprotocol/react-helpers';

 const mockUpdateDialogOpen = jest.fn();
 const mockCloseVegaDialog = jest.fn();
-const mockStoreObj: Partial<VegaWalletDialogStore> = {
-  updateVegaWalletDialog: mockUpdateDialogOpen,
-  closeVegaWalletDialog: mockCloseVegaDialog,
-  vegaWalletDialogOpen: true,
-};

 jest.mock('zustand', () => ({
-  create: () => (storeGetter: (store: VegaWalletDialogStore) => unknown) =>
-    storeGetter(mockStoreObj as VegaWalletDialogStore),
+  create: () => () => ({
+    updateVegaWalletDialog: mockUpdateDialogOpen,
+    closeVegaWalletDialog: mockCloseVegaDialog,
+    vegaWalletDialogOpen: true,
+  }),
 }));

 let defaultProps: VegaConnectDialogProps;
@@ -304,9 +301,7 @@ describe('VegaConnectDialog', () => {
      spyOnConnectWallet
        .mockClear()
        .mockImplementation(() =>
-          delayedReject(
-            new WalletError('User error', 3001, 'The user rejected the request')
-          )
+          delayedReject(new WalletError('message', 3001, 'data'))
        );

      render(generateJSX());
@@ -327,9 +322,9 @@ describe('VegaConnectDialog', () => {
      await act(async () => {
        jest.advanceTimersByTime(delay);
      });
-      expect(screen.getByText('User error')).toBeInTheDocument();
+      expect(screen.getByText('Connection declined')).toBeInTheDocument();
      expect(
-        screen.getByText('The user rejected the request')
+        screen.getByText('Your wallet connection was rejected')
      ).toBeInTheDocument();
    });

@@ -9,9 +9,8 @@ import {
  Loader,
 } from '@vegaprotocol/ui-toolkit';
 import { useCallback, useState } from 'react';
-import type { WalletClientError } from '@vegaprotocol/wallet-client';
 import { ExternalLinks, t, useChainIdQuery } from '@vegaprotocol/react-helpers';
-import type { VegaConnector } from '../connectors';
+import type { VegaConnector, WalletError } from '../connectors';
 import { ViewConnector } from '../connectors';
 import { JsonRpcConnector, RestConnector } from '../connectors';
 import { RestConnectorForm } from './rest-connector-form';
@@ -45,7 +44,7 @@ export const useVegaWalletDialogStore = create<VegaWalletDialogStore>(
  })
 );

-export interface VegaWalletDialogStore {
+interface VegaWalletDialogStore {
  vegaWalletDialogOpen: boolean;
  updateVegaWalletDialog: (open: boolean) => void;
  openVegaWalletDialog: () => void;
@@ -56,25 +55,25 @@ export const VegaConnectDialog = ({
  connectors,
  onChangeOpen,
 }: VegaConnectDialogProps) => {
-  const vegaWalletDialogOpen = useVegaWalletDialogStore(
-    (store) => store.vegaWalletDialogOpen
-  );
-  const updateVegaWalletDialog = useVegaWalletDialogStore((store) =>
-    onChangeOpen
+  const {
+    vegaWalletDialogOpen,
+    closeVegaWalletDialog,
+    updateVegaWalletDialog,
+  } = useVegaWalletDialogStore((store) => ({
+    vegaWalletDialogOpen: store.vegaWalletDialogOpen,
+    updateVegaWalletDialog: onChangeOpen
      ? (open: boolean) => {
          store.updateVegaWalletDialog(open);
          onChangeOpen(open);
        }
-      : store.updateVegaWalletDialog
-  );
-  const closeVegaWalletDialog = useVegaWalletDialogStore((store) =>
-    onChangeOpen
+      : store.updateVegaWalletDialog,
+    closeVegaWalletDialog: onChangeOpen
      ? () => {
          store.closeVegaWalletDialog();
          onChangeOpen(false);
        }
-      : store.closeVegaWalletDialog
-  );
+      : store.closeVegaWalletDialog,
+  }));

  const { data, error, loading } = useChainIdQuery();

@@ -255,7 +254,7 @@ const SelectedForm = ({
  appChainId: string;
  jsonRpcState: {
    status: Status;
-    error: WalletClientError | null;
+    error: WalletError | null;
  };
  reset: () => void;
  onConnect: () => void;
@@ -8,15 +8,16 @@ import {
  Tick,
 } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
-import type { WalletClientError } from '@vegaprotocol/wallet-client';
 import type { JsonRpcConnector } from '../connectors';
 import { ClientErrors } from '../connectors';
+import type { WalletError } from '../connectors';
 import { ConnectDialogTitle } from './connect-dialog-elements';
 import { Status } from '../use-json-rpc-connect';
 import { useEnvironment } from '@vegaprotocol/environment';

 export const ServiceErrors = {
  NO_HEALTHY_NODE: 1000,
+  CONNECTION_DECLINED: 3001,
  REQUEST_PROCESSING: -32000,
 };

@@ -30,7 +31,7 @@ export const JsonRpcConnectorForm = ({
  connector: JsonRpcConnector;
  appChainId: string;
  status: Status;
-  error: WalletClientError | null;
+  error: WalletError | null;
  onConnect: () => void;
  reset: () => void;
 }) => {
@@ -57,7 +58,7 @@ const Connecting = ({
  reset,
 }: {
  status: Status;
-  error: WalletClientError | null;
+  error: WalletError | null;
  connector: JsonRpcConnector;
  appChainId: string;
  reset: () => void;
@@ -140,7 +141,7 @@ const Error = ({
  appChainId,
  onTryAgain,
 }: {
-  error: WalletClientError | null;
+  error: WalletError | null;
  connectorUrl: string | null;
  appChainId: string;
  onTryAgain: () => void;
@@ -157,20 +158,18 @@ const Error = ({
  if (error) {
    if (error.code === ClientErrors.NO_SERVICE.code) {
      title = t('No wallet detected');
-      text = connectorUrl
-        ? t('No wallet application running at %s', connectorUrl)
-        : t('No Vega Wallet application running');
+      text = t(`No wallet application running at ${connectorUrl}`);
    } else if (error.code === ClientErrors.WRONG_NETWORK.code) {
      title = t('Wrong network');
-      text = t(
-        'To complete your wallet connection, set your wallet network in your app to "%s".',
-        appChainId
-      );
+      text = `To complete your wallet connection, set your wallet network in your app to "${appChainId}".`;
+    } else if (error.code === ServiceErrors.CONNECTION_DECLINED) {
+      title = t('Connection declined');
+      text = t('Your wallet connection was rejected');
    } else if (error.code === ServiceErrors.NO_HEALTHY_NODE) {
-      title = error.title;
+      title = error.message;
      text = (
        <>
-          {capitalize(error.message)}
+          {capitalize(error.data)}
          {'. '}
          {VEGA_DOCS_URL && (
            <Link
@@ -189,33 +188,20 @@ const Error = ({
      title = t('Wrong network');
      text = (
        <>
-          {t(
-            `To complete your wallet connection, set your wallet network in your
-            app to %s.`,
-            appChainId
-          )}
+          {t(`To complete your wallet connection, set your wallet network in your
+            app to ${appChainId}.`)}
        </>
      );
-    } else if (error.code === ClientErrors.INVALID_WALLET.code) {
-      title = error.title;
-      const errorData = error.message?.split('\n ') || [];
-      text = (
-        <span className="flex flex-col">
-          {errorData.map((str, i) => (
-            <span key={i}>{str}</span>
-          ))}
-        </span>
-      );
    } else {
-      title = t(error.title);
-      text = t(error.message);
+      title = error.message;
+      text = `${error.data} (${error.code})`;
    }
  }

  return (
    <>
      <ConnectDialogTitle>{title}</ConnectDialogTitle>
-      <p className="text-center mb-2 first-letter:uppercase">{text}</p>
+      <p className="text-center mb-2">{text}</p>
      {tryAgain}
    </>
  );
@@ -8,6 +8,8 @@ const VERSION = 'v2';

 export const ClientErrors = {
  NO_SERVICE: new WalletError(t('No service'), 100),
+  NO_TOKEN: new WalletError(t('No token'), 101),
+  INVALID_RESPONSE: new WalletError(t('Something went wrong'), 102),
  INVALID_WALLET: new WalletError(t('Wallet version invalid'), 103),
  WRONG_NETWORK: new WalletError(
    t('Wrong network'),
@@ -20,6 +22,11 @@ export const ClientErrors = {
    t('Unknown error occurred')
  ),
  NO_CLIENT: new WalletError(t('No client found.'), 106),
+  REQUEST_REJECTED: new WalletError(
+    t('Request rejected'),
+    107,
+    t('The request has been rejected by the user')
+  ),
 } as const;

 export class JsonRpcConnector implements VegaConnector {
@@ -63,9 +70,7 @@ export class JsonRpcConnector implements VegaConnector {
        }),
    });
  }
-  get url() {
-    return this._url || '';
-  }
+
  async getChainId() {
    if (!this.client) {
      throw ClientErrors.NO_CLIENT;
@@ -74,12 +79,7 @@ export class JsonRpcConnector implements VegaConnector {
      const { result } = await this.client.GetChainId();
      return result;
    } catch (err) {
-      const {
-        code = ClientErrors.UNKNOWN.code,
-        message = ClientErrors.UNKNOWN.message,
-        title,
-      } = err as WalletClientError;
-      throw new WalletError(title, code, message);
+      throw ClientErrors.INVALID_RESPONSE;
    }
  }

@@ -92,12 +92,11 @@ export class JsonRpcConnector implements VegaConnector {
      await this.client.ConnectWallet();
      return null;
    } catch (err) {
-      const {
-        code = ClientErrors.UNKNOWN.code,
-        message = ClientErrors.UNKNOWN.message,
-        title,
-      } = err as WalletClientError;
-      throw new WalletError(title, code, message);
+      const clientErr =
+        err instanceof WalletClientError && err.code === 3001
+          ? ClientErrors.REQUEST_REJECTED
+          : ClientErrors.INVALID_RESPONSE;
+      throw clientErr;
    }
  }

@@ -112,12 +111,7 @@ export class JsonRpcConnector implements VegaConnector {
      const { result } = await this.client.ListKeys();
      return result.keys;
    } catch (err) {
-      const {
-        code = ClientErrors.UNKNOWN.code,
-        message = ClientErrors.UNKNOWN.message,
-        title,
-      } = err as WalletClientError;
-      throw new WalletError(title, code, message);
+      throw ClientErrors.INVALID_RESPONSE;
    }
  }

@@ -153,21 +147,15 @@ export class JsonRpcConnector implements VegaConnector {
    try {
      const result = await fetch(`${this._url}/api/${this.version}/methods`);
      if (!result.ok) {
-        const sent1 = t(
-          'The version of the wallet service running at %s is not supported.',
-          this._url as string
+        const err = ClientErrors.INVALID_WALLET;
+        err.data = t(
+          `The wallet running at ${this._url} is not supported. Required version is ${this.version}`
        );
-        const sent2 = t(
-          'Update the wallet software to a version that expose the API %s.',
-          this.version
-        );
-        const data = `${sent1}\n ${sent2}`;
-        const title = t('Wallet version invalid');
-        throw new WalletError(title, ClientErrors.INVALID_WALLET.code, data);
+        throw err;
      }
      return true;
    } catch (err) {
-      if (err instanceof WalletClientError) {
+      if (err instanceof WalletError) {
        throw err;
      }

@@ -1,4 +1,3 @@
-import { WalletClientError } from '@vegaprotocol/wallet-client';
 import type * as Schema from '@vegaprotocol/types';

 export interface DelegateSubmissionBody {
@@ -330,11 +329,14 @@ export interface TransactionResponse {
  receivedAt: string;
  sentAt: string;
 }
-export class WalletError extends WalletClientError {
-  data: string;
+export class WalletError {
+  message: string;
+  code: number;
+  data?: string;

-  constructor(message: string, code: number, data = 'Wallet error') {
-    super({ code, message, data });
+  constructor(message: string, code: number, data?: string) {
+    this.message = message;
+    this.code = code;
    this.data = data;
  }
 }
@@ -1,7 +1,6 @@
 import { LocalStorage } from '@vegaprotocol/react-helpers';
 import type { ReactNode } from 'react';
 import { useCallback, useMemo, useRef, useState } from 'react';
-import { WalletClientError } from '@vegaprotocol/wallet-client';
 import type { VegaWalletContextShape } from '.';
 import type {
  PubKey,
@@ -10,6 +9,7 @@ import type {
 } from './connectors/vega-connector';
 import { VegaWalletContext } from './context';
 import { WALLET_KEY } from './storage';
+import { WalletError } from './connectors/vega-connector';
 import { ViewConnector } from './connectors';

 interface VegaWalletProviderProps {
@@ -53,7 +53,7 @@ export const VegaWalletProvider = ({ children }: VegaWalletProviderProps) => {
        return null;
      }
    } catch (err) {
-      if (err instanceof WalletClientError) {
+      if (err instanceof WalletError) {
        throw err;
      }
      return null;
@@ -1,7 +1,7 @@
 import { useCallback, useState } from 'react';
-import { WalletClientError } from '@vegaprotocol/wallet-client';
 import type { JsonRpcConnector } from './connectors';
 import { ClientErrors } from './connectors';
+import { WalletError } from './connectors';
 import { useVegaWallet } from './use-vega-wallet';

 export enum Status {
@@ -18,7 +18,7 @@ export enum Status {
 export const useJsonRpcConnect = (onConnect: () => void) => {
  const { connect } = useVegaWallet();
  const [status, setStatus] = useState(Status.Idle);
-  const [error, setError] = useState<WalletClientError | null>(null);
+  const [error, setError] = useState<WalletError | null>(null);

  const attemptConnect = useCallback(
    async (connector: JsonRpcConnector, appChainId: string) => {
@@ -56,7 +56,7 @@ export const useJsonRpcConnect = (onConnect: () => void) => {
        setStatus(Status.Connected);
        onConnect();
      } catch (err) {
-        if (err instanceof WalletClientError) {
+        if (err instanceof WalletError) {
          setError(err);
        }
        setStatus(Status.Error);
@@ -1,6 +1,7 @@
 import { useVegaWallet } from './use-vega-wallet';
 import { useEffect, useRef } from 'react';
 import { ClientErrors } from './connectors';
+import { WalletError } from './connectors';
 import { VegaTxStatus } from './use-vega-transaction';
 import { useVegaTransactionStore } from './use-vega-transaction-store';
 import { WalletClientError } from '@vegaprotocol/wallet-client';
@@ -39,7 +40,10 @@ export const useVegaTransactionManager = () => {
      })
      .catch((err) => {
        update(transaction.id, {
-          error: err instanceof WalletClientError ? err : ClientErrors.UNKNOWN,
+          error:
+            err instanceof WalletError || err instanceof WalletClientError
+              ? err
+              : ClientErrors.UNKNOWN,
          status: VegaTxStatus.Error,
        });
      });
@@ -98,14 +98,10 @@ describe('useVegaTransaction', () => {
    });
    expect(result.current.transaction.status).toEqual(VegaTxStatus.Error);
    expect(result.current.transaction.error).toHaveProperty(
-      'title',
+      'message',
      'Something went wrong'
    );
    expect(result.current.transaction.error).toHaveProperty('code', 105);
-    expect(result.current.transaction.error).toHaveProperty(
-      'message',
-      'Unknown error occurred'
-    );
    expect(result.current.transaction.error).toHaveProperty(
      'data',
      'Unknown error occurred'
@@ -6,6 +6,8 @@ import { VegaTransactionDialog } from './vega-transaction-dialog';
 import type { Intent } from '@vegaprotocol/ui-toolkit';
 import type { Transaction } from './connectors';
 import { ClientErrors } from './connectors';
+import { WalletError } from './connectors';
+import type { WalletClientError } from '@vegaprotocol/wallet-client';

 export interface DialogProps {
  intent?: Intent;
@@ -24,7 +26,7 @@ export enum VegaTxStatus {

 export interface VegaTxState {
  status: VegaTxStatus;
-  error: Error | null;
+  error: WalletError | WalletClientError | Error | null;
  txHash: string | null;
  signature: string | null;
  dialogOpen: boolean;
@@ -88,9 +90,14 @@ export const useVegaTransaction = () => {

        return null;
      } catch (err) {
-        const error = err instanceof Error ? err : ClientErrors.UNKNOWN;
+        const error =
+          err instanceof WalletError
+            ? err
+            : err instanceof Error
+            ? err
+            : ClientErrors.UNKNOWN;
        setTransaction({
-          error,
+          error: error,
          status: VegaTxStatus.Error,
        });
        return null;
@@ -10,9 +10,9 @@ export function useVegaWallet() {
 }

 export function useReconnectVegaWallet() {
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
+  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+    openVegaWalletDialog: store.openVegaWalletDialog,
+  }));
  const { disconnect } = useVegaWallet();
  const reconnect = useCallback(async () => {
    await disconnect();
@@ -2,7 +2,7 @@ import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/react-helpers';
 import { Dialog, Icon, Intent, Loader } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
-import { WalletClientError } from '@vegaprotocol/wallet-client';
+import { WalletError } from '../connectors';
 import type { VegaTxState } from '../use-vega-transaction';
 import { VegaTxStatus } from '../use-vega-transaction';

@@ -107,13 +107,18 @@ export const VegaDialog = ({ transaction }: VegaDialogProps) => {
  }

  if (transaction.status === VegaTxStatus.Error) {
-    let messageText = '';
-    if (transaction.error instanceof WalletClientError) {
-      messageText = `${transaction.error.title}: ${transaction.error.message}`;
-    } else if (transaction.error instanceof Error) {
-      messageText = transaction.error.message;
-    }
-    content = <div data-testid={transaction.status}>{messageText}</div>;
+    content = (
+      <div data-testid={transaction.status}>
+        {transaction.error instanceof WalletError && (
+          <p>
+            {transaction.error.message}: {transaction.error.data}
+          </p>
+        )}
+        {transaction.error instanceof Error && (
+          <p>{transaction.error.message}</p>
+        )}
+      </div>
+    );
  }

  if (transaction.status === VegaTxStatus.Pending) {
@@ -8,6 +8,6 @@ export * from './lib/withdrawal-feedback';
 export * from './lib/use-complete-withdraw';
 export * from './lib/use-create-withdraw';
 export * from './lib/use-verify-withdrawal';
-export * from './lib/withdrawals-provider';
+export * from './lib/use-withdrawals';
 export * from './lib/__generated__/Withdrawal';
 export * from './lib/__generated__/Erc20Approval';
@@ -0,0 +1,170 @@
+import * as Schema from '@vegaprotocol/types';
+import { generateWithdrawal } from './test-helpers';
+import { updateQuery } from './use-withdrawals';
+import type {
+  WithdrawalsQuery,
+  WithdrawalEventSubscription,
+  WithdrawalFieldsFragment,
+} from './__generated__/Withdrawal';
+
+describe('updateQuery', () => {
+  it('updates existing withdrawals', () => {
+    const withdrawal = generateWithdrawal({
+      id: '1',
+      status: Schema.WithdrawalStatus.STATUS_OPEN,
+    });
+    const withdrawalUpdate = generateWithdrawal({
+      id: '1',
+      status: Schema.WithdrawalStatus.STATUS_FINALIZED,
+    });
+    const prev = mockQuery([withdrawal]);
+    const incoming = mockSub([withdrawalUpdate]);
+
+    expect(updateQuery(prev, incoming)).toEqual({
+      party: {
+        __typename: 'Party',
+        id: 'party-id',
+        withdrawalsConnection: {
+          __typename: 'WithdrawalsConnection',
+          edges: [
+            {
+              node: withdrawalUpdate,
+            },
+          ],
+        },
+      },
+    });
+  });
+
+  it('Adds new withdrawals', () => {
+    const withdrawal = generateWithdrawal({
+      id: '1',
+      amount: '100',
+    });
+    const withdrawalUpdate = generateWithdrawal({
+      id: '2',
+      amount: '200',
+    });
+    const prev = mockQuery([withdrawal]);
+    const incoming = mockSub([withdrawalUpdate]);
+
+    expect(updateQuery(prev, incoming)).toEqual({
+      party: {
+        __typename: 'Party',
+        id: 'party-id',
+        withdrawalsConnection: {
+          __typename: 'WithdrawalsConnection',
+          edges: [
+            {
+              node: withdrawalUpdate,
+            },
+            {
+              node: withdrawal,
+            },
+          ],
+        },
+      },
+    });
+  });
+
+  it('creates new party if not present', () => {
+    const partyId = 'party-id';
+    const withdrawalUpdate = generateWithdrawal({
+      id: '2',
+    });
+    const incoming = mockSub([withdrawalUpdate]);
+
+    expect(
+      updateQuery({ party: null }, { ...incoming, variables: { partyId } })
+    ).toEqual({
+      party: {
+        __typename: 'Party',
+        id: partyId,
+        withdrawalsConnection: {
+          __typename: 'WithdrawalsConnection',
+          edges: [
+            {
+              node: withdrawalUpdate,
+            },
+          ],
+        },
+      },
+    });
+  });
+
+  it('Handles updates and inserts simultaneously', () => {
+    const withdrawal1 = generateWithdrawal({
+      id: '1',
+      status: Schema.WithdrawalStatus.STATUS_OPEN,
+    });
+    const withdrawal2 = generateWithdrawal({
+      id: '2',
+    });
+    const withdrawalUpdate = generateWithdrawal({
+      id: '1',
+      status: Schema.WithdrawalStatus.STATUS_FINALIZED,
+    });
+    const withdrawalNew = generateWithdrawal({
+      id: '3',
+    });
+
+    const prev = mockQuery([withdrawal1, withdrawal2]);
+    const incoming = mockSub([withdrawalUpdate, withdrawalNew]);
+    expect(updateQuery(prev, incoming)).toEqual({
+      party: {
+        __typename: 'Party',
+        id: 'party-id',
+        withdrawalsConnection: {
+          __typename: 'WithdrawalsConnection',
+          edges: [
+            {
+              node: withdrawalUpdate,
+            },
+            {
+              node: withdrawalNew,
+            },
+            {
+              node: withdrawal2,
+            },
+          ],
+        },
+      },
+    });
+  });
+});
+
+const mockQuery = (
+  withdrawals: WithdrawalFieldsFragment[]
+): WithdrawalsQuery => {
+  return {
+    party: {
+      __typename: 'Party',
+      id: 'party-id',
+      withdrawalsConnection: {
+        __typename: 'WithdrawalsConnection',
+        edges: withdrawals.map((w) => ({
+          node: w,
+        })),
+      },
+    },
+  };
+};
+
+const mockSub = (
+  withdrawals: WithdrawalFieldsFragment[]
+): {
+  subscriptionData: {
+    data: WithdrawalEventSubscription;
+  };
+} => {
+  return {
+    subscriptionData: {
+      data: {
+        busEvents: withdrawals.map((w) => ({
+          __typename: 'BusEvent',
+          event: w,
+        })),
+      },
+    },
+  };
+};
@@ -0,0 +1,111 @@
+import type { UpdateQueryFn } from '@apollo/client/core/watchQueryOptions';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import uniqBy from 'lodash/uniqBy';
+import { useEffect } from 'react';
+import {
+  useWithdrawalsQuery,
+  WithdrawalEventDocument,
+} from './__generated__/Withdrawal';
+import type {
+  WithdrawalsQuery,
+  WithdrawalFieldsFragment,
+  WithdrawalEventSubscription,
+  WithdrawalEventSubscriptionVariables,
+} from './__generated__/Withdrawal';
+import { removePaginationWrapper } from '@vegaprotocol/react-helpers';
+
+type WithdrawalEdges = { node: WithdrawalFieldsFragment }[];
+
+export const useWithdrawals = () => {
+  const { pubKey } = useVegaWallet();
+  const { data, loading, error, subscribeToMore } = useWithdrawalsQuery({
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+
+  useEffect(() => {
+    if (!pubKey) return;
+
+    const unsubscribe = subscribeToMore<
+      WithdrawalEventSubscription,
+      WithdrawalEventSubscriptionVariables
+    >({
+      document: WithdrawalEventDocument,
+      variables: { partyId: pubKey },
+      updateQuery,
+    });
+
+    return () => {
+      unsubscribe();
+    };
+  }, [pubKey, subscribeToMore]);
+
+  return {
+    data: removePaginationWrapper(
+      data?.party?.withdrawalsConnection?.edges ?? []
+    ).sort((a, b) => {
+      if (!b.txHash !== !a.txHash) {
+        return b.txHash ? -1 : 1;
+      }
+      return (
+        b.txHash ? b.withdrawnTimestamp : b.createdTimestamp
+      ).localeCompare(a.txHash ? a.withdrawnTimestamp : a.createdTimestamp);
+    }),
+    loading,
+    error,
+  };
+};
+
+export const updateQuery: UpdateQueryFn<
+  WithdrawalsQuery,
+  WithdrawalEventSubscriptionVariables,
+  WithdrawalEventSubscription
+> = (prev, { subscriptionData, variables }) => {
+  if (!subscriptionData.data.busEvents?.length) {
+    return prev;
+  }
+
+  const curr = prev.party?.withdrawalsConnection?.edges || [];
+  const incoming = subscriptionData.data.busEvents.reduce<WithdrawalEdges>(
+    (acc, event) => {
+      if (event.event.__typename === 'Withdrawal') {
+        acc.push({
+          node: {
+            ...event.event,
+            pendingOnForeignChain: false,
+          },
+        });
+      }
+      return acc;
+    },
+    []
+  );
+
+  const edges = uniqBy([...incoming, ...curr], 'node.id');
+
+  // Write new party to cache if not present
+  if (!prev.party) {
+    return {
+      ...prev,
+      party: {
+        id: variables?.partyId,
+        __typename: 'Party',
+        withdrawalsConnection: {
+          __typename: 'WithdrawalsConnection',
+          edges,
+        },
+      },
+    } as WithdrawalsQuery;
+  }
+
+  return {
+    ...prev,
+    party: {
+      ...prev.party,
+      withdrawalsConnection: {
+        __typename: 'WithdrawalsConnection',
+        edges,
+      },
+    },
+  };
+};
@@ -1,56 +0,0 @@
-import uniqBy from 'lodash/uniqBy';
-import { makeDataProvider } from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
-import {
-  WithdrawalsDocument,
-  WithdrawalEventDocument,
-} from './__generated__/Withdrawal';
-import type {
-  WithdrawalsQuery,
-  WithdrawalFieldsFragment,
-  WithdrawalEventSubscription,
-  WithdrawalEventSubscriptionVariables,
-} from './__generated__/Withdrawal';
-import {
-  removePaginationWrapper,
-  getEvents,
-} from '@vegaprotocol/react-helpers';
-
-const sortWithdrawals = (data: WithdrawalFieldsFragment[]) =>
-  data.sort((a, b) => {
-    if (!b.txHash !== !a.txHash) {
-      return b.txHash ? -1 : 1;
-    }
-    return (b.txHash ? b.withdrawnTimestamp : b.createdTimestamp).localeCompare(
-      a.txHash ? a.withdrawnTimestamp : a.createdTimestamp
-    );
-  });
-
-export const withdrawalProvider = makeDataProvider<
-  WithdrawalsQuery,
-  WithdrawalFieldsFragment[],
-  WithdrawalEventSubscription,
-  WithdrawalEventSubscription,
-  WithdrawalEventSubscriptionVariables
->({
-  query: WithdrawalsDocument,
-  subscriptionQuery: WithdrawalEventDocument,
-  getData: (data: WithdrawalsQuery | null) =>
-    sortWithdrawals(
-      removePaginationWrapper(data?.party?.withdrawalsConnection?.edges || [])
-    ),
-  getDelta: (data: WithdrawalEventSubscription) => data,
-  update: (
-    data: WithdrawalFieldsFragment[] | null,
-    delta: WithdrawalEventSubscription
-  ) => {
-    if (!delta.busEvents?.length) {
-      return data;
-    }
-    const incoming = getEvents<WithdrawalFieldsFragment>(
-      Schema.BusEventType.Withdrawal,
-      delta.busEvents
-    );
-    return uniqBy([...incoming, ...(data || [])], 'id');
-  },
-});
@@ -36,7 +36,7 @@
    "@sentry/nextjs": "^6.19.3",
    "@sentry/react": "^6.19.2",
    "@sentry/tracing": "^6.19.2",
-    "@vegaprotocol/wallet-client": "0.1.9",
+    "@vegaprotocol/wallet-client": "0.1.8",
    "@walletconnect/ethereum-provider": "^1.7.5",
    "@web3-react/core": "8.0.20-beta.0",
    "@web3-react/metamask": "8.0.16-beta.0",
@@ -7321,10 +7321,10 @@
    "@typescript-eslint/types" "5.40.0"
    eslint-visitor-keys "^3.3.0"

-"@vegaprotocol/wallet-client@0.1.9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@vegaprotocol/wallet-client/-/wallet-client-0.1.9.tgz#8c6a71c8b2222b3de5d73cade8fc6db57e332de9"
-  integrity sha512-oacfJGT0zHM+1If4I/pgIWi7zzU/3uHy4+sjuFEh8pWI8bWBzCF+mHbOGA6iTM+5/5mhayMFc+YZ9GexH1sBnQ==
+"@vegaprotocol/wallet-client@0.1.8":
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/@vegaprotocol/wallet-client/-/wallet-client-0.1.8.tgz#38ca8566d78b9f6694b12ad9364bb34d6482935d"
+  integrity sha512-FVvDvvlccKyXn0ujhivPUCVnkZYQJxtI1q8OgipNnbmAjU1mLyeuRTBw0Isu330yPI1KppNbW6Qicd8OTHBmxw==
  dependencies:
    express "4.18.2"
    nanoid "3.3.4"