From 4bb78e98919f566b6f431eaa5af50687a9513a7d Mon Sep 17 00:00:00 2001
From: Maciek <maciek@vegaprotocol.io>
Date: Mon, 27 Feb 2023 16:44:48 +0100
Subject: [PATCH 1/8] chore(ui-toolkit): loader no rerender version only
 (#3011)

---
 apps/static/src/assets/preloader.css          | 108 +++++++++++++
 .../components/preloader/preloader.tsx        |   2 +-
 apps/trading/pages/gen-styles.scss            |  33 ++--
 apps/trading/public/preloader.css             | 146 +++++++++---------
 .../src/components/loader/loader.tsx          |  21 +--
 5 files changed, 202 insertions(+), 108 deletions(-)
 create mode 100644 apps/static/src/assets/preloader.css

diff --git a/apps/static/src/assets/preloader.css b/apps/static/src/assets/preloader.css
new file mode 100644
index 000000000..9ea72991c
--- /dev/null
+++ b/apps/static/src/assets/preloader.css
@@ -0,0 +1,108 @@
+.pre-loader {
+  display: flex;
+  width: 100%;
+  min-height: 100vh;
+  justify-content: center;
+  align-items: center;
+}
+.pre-loader .loader-item {
+  width: 10px;
+  height: 10px;
+  background: #000;
+}
+.pre-loader .pre-loader-center {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+}
+.pre-loader .pre-loader-wrapper {
+  width: 50px;
+  height: 50px;
+  display: flex;
+  flex-wrap: wrap;
+}
+.loader-item:nth-child(0) {
+  animation-delay: 0ms;
+  animation-direction: reverse;
+}
+.loader-item:first-child {
+  animation-delay: -0.2s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(2) {
+  animation-delay: 0.4s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(3) {
+  animation-delay: -0.15s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(4) {
+  animation-delay: 0.6s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(5) {
+  animation-delay: -1s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(6) {
+  animation-delay: 0.3s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(7) {
+  animation-delay: -0.35s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(8) {
+  animation-delay: 2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(9) {
+  animation-delay: -0.45s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(10) {
+  animation-delay: 2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(11) {
+  animation-delay: -0.55s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(12) {
+  animation-delay: 1.2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(13) {
+  animation-delay: -2.6s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(14) {
+  animation-delay: 2.8s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(15) {
+  animation-delay: -3s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(16) {
+  animation-delay: 1.6s;
+  animation-direction: reverse;
+}
+.loader-item {
+  animation: flickering 0.4s linear infinite alternate;
+}
+@keyframes flickering {
+  0% {
+    opacity: 1;
+  }
+  25% {
+    opacity: 1;
+  }
+  26% {
+    opacity: 0;
+  }
+  to {
+    opacity: 0;
+  }
+}
diff --git a/apps/trading/components/preloader/preloader.tsx b/apps/trading/components/preloader/preloader.tsx
index 7ae503363..a973d590b 100644
--- a/apps/trading/components/preloader/preloader.tsx
+++ b/apps/trading/components/preloader/preloader.tsx
@@ -13,7 +13,7 @@ export const Preloader = () => {
         `}
       </style>
       <div className="pre-loader">
-        <Loader forceTheme="light" preloader />
+        <Loader forceTheme="light" />
       </div>
     </>
   );
diff --git a/apps/trading/pages/gen-styles.scss b/apps/trading/pages/gen-styles.scss
index 6737f9167..c25e95f6a 100644
--- a/apps/trading/pages/gen-styles.scss
+++ b/apps/trading/pages/gen-styles.scss
@@ -4,17 +4,10 @@
   min-height: 100vh;
   justify-content: center;
   align-items: center;
-
-  @for $i from 0 through 16 {
-    .loader-item:nth-child(#{$i}) {
-      @if $i % 2 == 0 {
-        animation-delay: #{$i * 50 * random(5)}ms;
-        animation-direction: reverse;
-      } @else {
-        animation-delay: #{$i * -50 * random(5)}ms;
-        animation-direction: alternate;
-      }
-    }
+  .loader-item {
+    width: 10px;
+    height: 10px;
+    background: black;
   }
   .pre-loader-center {
     align-items: center;
@@ -27,13 +20,21 @@
     display: flex;
     flex-wrap: wrap;
   }
-  .loader-item {
-    width: 10px;
-    height: 10px;
-    background: black;
-    animation: flickering 0.4s steps(2, jump-none) alternate infinite;
+}
+@for $i from 0 through 16 {
+  .loader-item:nth-child(#{$i}) {
+    @if $i % 2 == 0 {
+      animation-delay: #{$i * 50 * random(5)}ms;
+      animation-direction: reverse;
+    } @else {
+      animation-delay: #{$i * -50 * random(5)}ms;
+      animation-direction: alternate;
+    }
   }
 }
+.loader-item {
+  animation: flickering 0.4s linear alternate infinite;
+}
 @keyframes flickering {
   0% {
     opacity: 1;
diff --git a/apps/trading/public/preloader.css b/apps/trading/public/preloader.css
index 33afae4ea..9ea72991c 100644
--- a/apps/trading/public/preloader.css
+++ b/apps/trading/public/preloader.css
@@ -5,73 +5,10 @@
   justify-content: center;
   align-items: center;
 }
-.pre-loader .loader-item:nth-child(0) {
-  animation-delay: 0ms;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:first-child {
-  animation-delay: -0.2s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(2) {
-  animation-delay: 0.1s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(3) {
-  animation-delay: -0.15s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(4) {
-  animation-delay: 1s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(5) {
-  animation-delay: -0.25s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(6) {
-  animation-delay: 0.3s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(7) {
-  animation-delay: -1.05s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(8) {
-  animation-delay: 0.8s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(9) {
-  animation-delay: -0.9s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(10) {
-  animation-delay: 0.5s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(11) {
-  animation-delay: -2.75s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(12) {
-  animation-delay: 2.4s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(13) {
-  animation-delay: -0.65s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(14) {
-  animation-delay: 0.7s;
-  animation-direction: reverse;
-}
-.pre-loader .loader-item:nth-child(15) {
-  animation-delay: -3s;
-  animation-direction: alternate;
-}
-.pre-loader .loader-item:nth-child(16) {
-  animation-delay: 2.4s;
-  animation-direction: reverse;
+.pre-loader .loader-item {
+  width: 10px;
+  height: 10px;
+  background: #000;
 }
 .pre-loader .pre-loader-center {
   align-items: center;
@@ -84,11 +21,76 @@
   display: flex;
   flex-wrap: wrap;
 }
-.pre-loader .loader-item {
-  width: 10px;
-  height: 10px;
-  background: #000;
-  animation: flickering 0.4s steps(2, jump-none) infinite alternate;
+.loader-item:nth-child(0) {
+  animation-delay: 0ms;
+  animation-direction: reverse;
+}
+.loader-item:first-child {
+  animation-delay: -0.2s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(2) {
+  animation-delay: 0.4s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(3) {
+  animation-delay: -0.15s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(4) {
+  animation-delay: 0.6s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(5) {
+  animation-delay: -1s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(6) {
+  animation-delay: 0.3s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(7) {
+  animation-delay: -0.35s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(8) {
+  animation-delay: 2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(9) {
+  animation-delay: -0.45s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(10) {
+  animation-delay: 2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(11) {
+  animation-delay: -0.55s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(12) {
+  animation-delay: 1.2s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(13) {
+  animation-delay: -2.6s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(14) {
+  animation-delay: 2.8s;
+  animation-direction: reverse;
+}
+.loader-item:nth-child(15) {
+  animation-delay: -3s;
+  animation-direction: alternate;
+}
+.loader-item:nth-child(16) {
+  animation-delay: 1.6s;
+  animation-direction: reverse;
+}
+.loader-item {
+  animation: flickering 0.4s linear infinite alternate;
 }
 @keyframes flickering {
   0% {
diff --git a/libs/ui-toolkit/src/components/loader/loader.tsx b/libs/ui-toolkit/src/components/loader/loader.tsx
index 47b8e6ede..89ada6310 100644
--- a/libs/ui-toolkit/src/components/loader/loader.tsx
+++ b/libs/ui-toolkit/src/components/loader/loader.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo } from 'react';
 
 const pseudoRandom = (seed: number) => {
   let value = seed;
@@ -12,26 +12,9 @@ const pseudoRandom = (seed: number) => {
 export interface LoaderProps {
   size?: 'small' | 'large';
   forceTheme?: 'dark' | 'light';
-  preloader?: boolean;
 }
 
-export const Loader = ({
-  size = 'large',
-  forceTheme,
-  preloader,
-}: LoaderProps) => {
-  const [, forceRender] = useState(false);
-
-  useEffect(() => {
-    const interval = preloader
-      ? undefined
-      : setInterval(() => {
-          forceRender((x) => !x);
-        }, 100);
-
-    return () => clearInterval(interval);
-  }, [preloader]);
-
+export const Loader = ({ size = 'large', forceTheme }: LoaderProps) => {
   const itemClasses = classNames('loader-item', {
     'dark:bg-white bg-black': !forceTheme,
     'bg-white': forceTheme === 'dark',

From a02100b079e59ffa2abd48b4234325824c1c6ffb Mon Sep 17 00:00:00 2001
From: Maciek <maciek@vegaprotocol.io>
Date: Mon, 27 Feb 2023 16:51:50 +0100
Subject: [PATCH 2/8] chore(ui-toolkit): revert: loader no rerender version
 only

---
 apps/static/src/assets/preloader.css          | 108 -------------
 .../components/preloader/preloader.tsx        |   2 +-
 apps/trading/pages/gen-styles.scss            |  33 ++--
 apps/trading/public/preloader.css             | 146 +++++++++---------
 .../src/components/loader/loader.tsx          |  21 ++-
 5 files changed, 108 insertions(+), 202 deletions(-)
 delete mode 100644 apps/static/src/assets/preloader.css

diff --git a/apps/static/src/assets/preloader.css b/apps/static/src/assets/preloader.css
deleted file mode 100644
index 9ea72991c..000000000
--- a/apps/static/src/assets/preloader.css
+++ /dev/null
@@ -1,108 +0,0 @@
-.pre-loader {
-  display: flex;
-  width: 100%;
-  min-height: 100vh;
-  justify-content: center;
-  align-items: center;
-}
-.pre-loader .loader-item {
-  width: 10px;
-  height: 10px;
-  background: #000;
-}
-.pre-loader .pre-loader-center {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-}
-.pre-loader .pre-loader-wrapper {
-  width: 50px;
-  height: 50px;
-  display: flex;
-  flex-wrap: wrap;
-}
-.loader-item:nth-child(0) {
-  animation-delay: 0ms;
-  animation-direction: reverse;
-}
-.loader-item:first-child {
-  animation-delay: -0.2s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(2) {
-  animation-delay: 0.4s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(3) {
-  animation-delay: -0.15s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(4) {
-  animation-delay: 0.6s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(5) {
-  animation-delay: -1s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(6) {
-  animation-delay: 0.3s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(7) {
-  animation-delay: -0.35s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(8) {
-  animation-delay: 2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(9) {
-  animation-delay: -0.45s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(10) {
-  animation-delay: 2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(11) {
-  animation-delay: -0.55s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(12) {
-  animation-delay: 1.2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(13) {
-  animation-delay: -2.6s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(14) {
-  animation-delay: 2.8s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(15) {
-  animation-delay: -3s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(16) {
-  animation-delay: 1.6s;
-  animation-direction: reverse;
-}
-.loader-item {
-  animation: flickering 0.4s linear infinite alternate;
-}
-@keyframes flickering {
-  0% {
-    opacity: 1;
-  }
-  25% {
-    opacity: 1;
-  }
-  26% {
-    opacity: 0;
-  }
-  to {
-    opacity: 0;
-  }
-}
diff --git a/apps/trading/components/preloader/preloader.tsx b/apps/trading/components/preloader/preloader.tsx
index a973d590b..7ae503363 100644
--- a/apps/trading/components/preloader/preloader.tsx
+++ b/apps/trading/components/preloader/preloader.tsx
@@ -13,7 +13,7 @@ export const Preloader = () => {
         `}
       </style>
       <div className="pre-loader">
-        <Loader forceTheme="light" />
+        <Loader forceTheme="light" preloader />
       </div>
     </>
   );
diff --git a/apps/trading/pages/gen-styles.scss b/apps/trading/pages/gen-styles.scss
index c25e95f6a..6737f9167 100644
--- a/apps/trading/pages/gen-styles.scss
+++ b/apps/trading/pages/gen-styles.scss
@@ -4,10 +4,17 @@
   min-height: 100vh;
   justify-content: center;
   align-items: center;
-  .loader-item {
-    width: 10px;
-    height: 10px;
-    background: black;
+
+  @for $i from 0 through 16 {
+    .loader-item:nth-child(#{$i}) {
+      @if $i % 2 == 0 {
+        animation-delay: #{$i * 50 * random(5)}ms;
+        animation-direction: reverse;
+      } @else {
+        animation-delay: #{$i * -50 * random(5)}ms;
+        animation-direction: alternate;
+      }
+    }
   }
   .pre-loader-center {
     align-items: center;
@@ -20,21 +27,13 @@
     display: flex;
     flex-wrap: wrap;
   }
-}
-@for $i from 0 through 16 {
-  .loader-item:nth-child(#{$i}) {
-    @if $i % 2 == 0 {
-      animation-delay: #{$i * 50 * random(5)}ms;
-      animation-direction: reverse;
-    } @else {
-      animation-delay: #{$i * -50 * random(5)}ms;
-      animation-direction: alternate;
-    }
+  .loader-item {
+    width: 10px;
+    height: 10px;
+    background: black;
+    animation: flickering 0.4s steps(2, jump-none) alternate infinite;
   }
 }
-.loader-item {
-  animation: flickering 0.4s linear alternate infinite;
-}
 @keyframes flickering {
   0% {
     opacity: 1;
diff --git a/apps/trading/public/preloader.css b/apps/trading/public/preloader.css
index 9ea72991c..33afae4ea 100644
--- a/apps/trading/public/preloader.css
+++ b/apps/trading/public/preloader.css
@@ -5,10 +5,73 @@
   justify-content: center;
   align-items: center;
 }
-.pre-loader .loader-item {
-  width: 10px;
-  height: 10px;
-  background: #000;
+.pre-loader .loader-item:nth-child(0) {
+  animation-delay: 0ms;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:first-child {
+  animation-delay: -0.2s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(2) {
+  animation-delay: 0.1s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(3) {
+  animation-delay: -0.15s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(4) {
+  animation-delay: 1s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(5) {
+  animation-delay: -0.25s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(6) {
+  animation-delay: 0.3s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(7) {
+  animation-delay: -1.05s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(8) {
+  animation-delay: 0.8s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(9) {
+  animation-delay: -0.9s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(10) {
+  animation-delay: 0.5s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(11) {
+  animation-delay: -2.75s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(12) {
+  animation-delay: 2.4s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(13) {
+  animation-delay: -0.65s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(14) {
+  animation-delay: 0.7s;
+  animation-direction: reverse;
+}
+.pre-loader .loader-item:nth-child(15) {
+  animation-delay: -3s;
+  animation-direction: alternate;
+}
+.pre-loader .loader-item:nth-child(16) {
+  animation-delay: 2.4s;
+  animation-direction: reverse;
 }
 .pre-loader .pre-loader-center {
   align-items: center;
@@ -21,76 +84,11 @@
   display: flex;
   flex-wrap: wrap;
 }
-.loader-item:nth-child(0) {
-  animation-delay: 0ms;
-  animation-direction: reverse;
-}
-.loader-item:first-child {
-  animation-delay: -0.2s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(2) {
-  animation-delay: 0.4s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(3) {
-  animation-delay: -0.15s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(4) {
-  animation-delay: 0.6s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(5) {
-  animation-delay: -1s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(6) {
-  animation-delay: 0.3s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(7) {
-  animation-delay: -0.35s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(8) {
-  animation-delay: 2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(9) {
-  animation-delay: -0.45s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(10) {
-  animation-delay: 2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(11) {
-  animation-delay: -0.55s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(12) {
-  animation-delay: 1.2s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(13) {
-  animation-delay: -2.6s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(14) {
-  animation-delay: 2.8s;
-  animation-direction: reverse;
-}
-.loader-item:nth-child(15) {
-  animation-delay: -3s;
-  animation-direction: alternate;
-}
-.loader-item:nth-child(16) {
-  animation-delay: 1.6s;
-  animation-direction: reverse;
-}
-.loader-item {
-  animation: flickering 0.4s linear infinite alternate;
+.pre-loader .loader-item {
+  width: 10px;
+  height: 10px;
+  background: #000;
+  animation: flickering 0.4s steps(2, jump-none) infinite alternate;
 }
 @keyframes flickering {
   0% {
diff --git a/libs/ui-toolkit/src/components/loader/loader.tsx b/libs/ui-toolkit/src/components/loader/loader.tsx
index 89ada6310..47b8e6ede 100644
--- a/libs/ui-toolkit/src/components/loader/loader.tsx
+++ b/libs/ui-toolkit/src/components/loader/loader.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 const pseudoRandom = (seed: number) => {
   let value = seed;
@@ -12,9 +12,26 @@ const pseudoRandom = (seed: number) => {
 export interface LoaderProps {
   size?: 'small' | 'large';
   forceTheme?: 'dark' | 'light';
+  preloader?: boolean;
 }
 
-export const Loader = ({ size = 'large', forceTheme }: LoaderProps) => {
+export const Loader = ({
+  size = 'large',
+  forceTheme,
+  preloader,
+}: LoaderProps) => {
+  const [, forceRender] = useState(false);
+
+  useEffect(() => {
+    const interval = preloader
+      ? undefined
+      : setInterval(() => {
+          forceRender((x) => !x);
+        }, 100);
+
+    return () => clearInterval(interval);
+  }, [preloader]);
+
   const itemClasses = classNames('loader-item', {
     'dark:bg-white bg-black': !forceTheme,
     'bg-white': forceTheme === 'dark',

From 4eb6e09bd49f8d78b9c628c9855cd8ef2eb88020 Mon Sep 17 00:00:00 2001
From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com>
Date: Mon, 27 Feb 2023 13:04:13 -0500
Subject: [PATCH 3/8] fix(trading): condense deal ticket & market info price
 range snags (#3012)

---
 .../app/components/markets/market-details.tsx |   5 +-
 libs/assets/src/lib/asset-details-dialog.tsx  |   2 +-
 .../deal-ticket/deal-ticket-button.tsx        |   2 +-
 .../deal-ticket/deal-ticket-fee-details.tsx   |   2 +-
 .../deal-ticket/deal-ticket-limit-amount.tsx  |   2 +-
 .../deal-ticket/deal-ticket-market-amount.tsx |   4 +-
 .../components/deal-ticket/deal-ticket.tsx    |  12 +-
 .../components/market-info/info-market.tsx    | 110 ++++++++++--------
 .../src/lib/format/number.spec.tsx            |  18 +++
 .../src/components/form-group/form-group.tsx  |   2 +-
 .../key-value-table/key-value-table.tsx       |   6 +-
 11 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/apps/explorer/src/app/components/markets/market-details.tsx b/apps/explorer/src/app/components/markets/market-details.tsx
index 405f354a9..2b642a6d3 100644
--- a/apps/explorer/src/app/components/markets/market-details.tsx
+++ b/apps/explorer/src/app/components/markets/market-details.tsx
@@ -184,9 +184,8 @@ export const MarketDetails = ({
       content: (
         <>
           <p className="text-xs mb-4">
-            {`For liquidity orders count towards a commitment they have to be
-        within either the liquidity or price monitoring bounds (whichever is
-        tighter).`}
+            {`For liquidity orders to count towards a commitment, they must be
+            within the liquidity monitoring bounds.`}
           </p>
           <p className="text-xs mb-4">
             {`The liquidity price range is a ${liquidityPriceRange} difference from the mid
diff --git a/libs/assets/src/lib/asset-details-dialog.tsx b/libs/assets/src/lib/asset-details-dialog.tsx
index 4c581df8f..a45789b3a 100644
--- a/libs/assets/src/lib/asset-details-dialog.tsx
+++ b/libs/assets/src/lib/asset-details-dialog.tsx
@@ -98,7 +98,7 @@ export const AssetDetailsDialog = ({
       }}
     >
       {content}
-      <p className="text-sm mb-4">
+      <p className="text-sm my-4">
         {t(
           'There is 1 unit of the settlement asset (%s) to every 1 quote unit.',
           [assetSymbol]
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx
index 5960612bd..1eae3d5a6 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-button.tsx
@@ -12,7 +12,7 @@ export const DealTicketButton = ({ disabled, variant }: Props) => {
   const { pubKey, isReadOnly } = useVegaWallet();
   const isDisabled = !pubKey || isReadOnly || disabled;
   return (
-    <div className="mb-4">
+    <div className="mb-2">
       <Button
         variant={variant}
         fill
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
index 1fb6636aa..d68c192b5 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-fee-details.tsx
@@ -31,7 +31,7 @@ export const DealTicketFeeDetails = ({
     <div>
       {details.map(({ label, value, labelDescription, symbol }) => (
         <div
-          key={label}
+          key={typeof label === 'string' ? label : 'value-dropdown'}
           className="text-xs mt-2 flex justify-between items-center gap-4 flex-wrap"
         >
           <div>
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx
index f990b2a26..31136e5c2 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx
@@ -38,7 +38,7 @@ export const DealTicketLimitAmount = ({
   };
 
   return (
-    <div className="mb-6">
+    <div className="mb-2">
       <div className="flex items-center gap-4">
         <div className="flex-1">
           <FormGroup
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx
index 70b8db874..c4371d213 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx
@@ -29,9 +29,9 @@ export const DealTicketMarketAmount = ({
     : undefined;
 
   return (
-    <div className="mb-6">
+    <div className="mb-2">
       <div className="flex items-end gap-4 mb-2">
-        <div className="flex-1 text-sm">Size</div>
+        <div className="flex-1 text-sm">{t('Size')}</div>
         <div />
         <div className="flex-2 text-sm text-right">
           {isMarketInAuction(marketData.marketTradingMode) && (
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
index ac7848783..0b0aaefa0 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
@@ -307,7 +307,7 @@ const SummaryMessage = memo(
     );
     if (isReadOnly) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <InputError testId="dealticket-error-message-summary">
             {
               'You need to connect your own wallet to start trading on this market'
@@ -318,7 +318,7 @@ const SummaryMessage = memo(
     }
     if (!pubKey) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <Notification
             testId={'deal-ticket-connect-wallet'}
             intent={Intent.Warning}
@@ -343,7 +343,7 @@ const SummaryMessage = memo(
     }
     if (errorMessage === SummaryValidationType.NoCollateral) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <ZeroBalanceError
             asset={market.tradableInstrument.instrument.product.settlementAsset}
             onClickCollateral={onClickCollateral}
@@ -356,7 +356,7 @@ const SummaryMessage = memo(
     // submission render that first
     if (errorMessage) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <InputError testId="dealticket-error-message-summary">
             {errorMessage}
           </InputError>
@@ -368,7 +368,7 @@ const SummaryMessage = memo(
     // balance render the margin warning, but still allow submission
     if (balanceError) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <MarginWarning balance={balance} margin={margin} asset={asset} />;
         </div>
       );
@@ -383,7 +383,7 @@ const SummaryMessage = memo(
       ].includes(marketData.marketTradingMode)
     ) {
       return (
-        <div className="mb-4">
+        <div className="mb-2">
           <Notification
             intent={Intent.Warning}
             testId={'dealticket-warning-auction'}
diff --git a/libs/market-info/src/components/market-info/info-market.tsx b/libs/market-info/src/components/market-info/info-market.tsx
index adaf87513..7fde24e61 100644
--- a/libs/market-info/src/components/market-info/info-market.tsx
+++ b/libs/market-info/src/components/market-info/info-market.tsx
@@ -145,7 +145,7 @@ export const Info = ({ market, onSelect }: InfoProps) => {
             }}
             decimalPlaces={market.decimalPlaces}
           />
-          <p className="text-xs">
+          <p className="text-xs mt-4">
             {t(
               'There is 1 unit of the settlement asset (%s) to every 1 quote unit (%s).',
               [assetSymbol, quoteUnit]
@@ -249,7 +249,7 @@ export const Info = ({ market, onSelect }: InfoProps) => {
             dtClassName="text-black dark:text-white text-ui !px-0 !font-normal"
             ddClassName="text-black dark:text-white text-ui !px-0 !font-normal max-w-full"
           />
-          <p className="text-xs">
+          <p className="text-xs mt-4">
             {t(
               'There is 1 unit of the settlement asset (%s) to every 1 quote unit (%s).',
               [assetSymbol, quoteUnit]
@@ -309,27 +309,40 @@ export const Info = ({ market, onSelect }: InfoProps) => {
       ),
     },
     ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
-      (trigger, i) => ({
-        title: t(`Price monitoring trigger ${i + 1}`),
-        content: <MarketInfoTable data={trigger} />,
-      })
+      (trigger, i) => {
+        const bounds = market.data?.priceMonitoringBounds?.[i];
+        return {
+          title: t(`Price monitoring bounds ${i + 1}`),
+          content: (
+            <div className="text-xs">
+              <div className="grid grid-cols-2 text-xs mb-4">
+                <p className="col-span-1">
+                  {t('%s% probability of trading', [
+                    formatNumber(trigger.probability * 100),
+                  ])}
+                </p>
+                <p className="col-span-1 text-right">
+                  {t('Within %s seconds', [formatNumber(trigger.horizonSecs)])}
+                </p>
+              </div>
+              <div className="pl-2 pb-0 text-xs border-l-2">
+                {bounds && (
+                  <MarketInfoTable
+                    data={{
+                      highestPrice: bounds.maxValidPrice,
+                      lowestPrice: bounds.minValidPrice,
+                      referencePrice: bounds.referencePrice,
+                    }}
+                    decimalPlaces={assetDecimals}
+                    assetSymbol={quoteUnit}
+                  />
+                )}
+              </div>
+            </div>
+          ),
+        };
+      }
     ),
-    ...(market.data?.priceMonitoringBounds || []).map((trigger, i) => ({
-      title: t(`Price monitoring bound ${i + 1}`),
-      content: (
-        <>
-          <MarketInfoTable
-            data={trigger}
-            decimalPlaces={market.decimalPlaces}
-            omits={['referencePrice', '__typename']}
-          />
-          <MarketInfoTable
-            data={{ referencePrice: trigger.referencePrice }}
-            decimalPlaces={assetDecimals}
-          />
-        </>
-      ),
-    })),
     {
       title: t('Liquidity monitoring parameters'),
       content: (
@@ -369,37 +382,38 @@ export const Info = ({ market, onSelect }: InfoProps) => {
       content: (
         <>
           <p className="text-xs mb-4">
-            {`For liquidity orders count towards a commitment they have to be
-            within either the liquidity or price monitoring bounds (whichever is
-            tighter).`}
+            {`For liquidity orders to count towards a commitment, they must be
+            within the liquidity monitoring bounds.`}
           </p>
           <p className="text-xs mb-4">
             {`The liquidity price range is a ${liquidityPriceRange} difference from the mid
             price.`}
           </p>
-          <MarketInfoTable
-            data={{
-              liquidityPriceRange: `${liquidityPriceRange} of mid price`,
-              lowestPrice:
-                market.data?.midPrice &&
-                `${addDecimalsFormatNumber(
-                  new BigNumber(1)
-                    .minus(market.lpPriceRange)
-                    .times(market.data.midPrice)
-                    .toString(),
-                  market.decimalPlaces
-                )} ${quoteUnit}`,
-              highestPrice:
-                market.data?.midPrice &&
-                `${addDecimalsFormatNumber(
-                  new BigNumber(1)
-                    .plus(market.lpPriceRange)
-                    .times(market.data.midPrice)
-                    .toString(),
-                  market.decimalPlaces
-                )} ${quoteUnit}`,
-            }}
-          ></MarketInfoTable>
+          <div className="pl-2 pb-0 text-xs border-l-2">
+            <MarketInfoTable
+              data={{
+                liquidityPriceRange: `${liquidityPriceRange} of mid price`,
+                lowestPrice:
+                  market.data?.midPrice &&
+                  `${addDecimalsFormatNumber(
+                    new BigNumber(1)
+                      .minus(market.lpPriceRange)
+                      .times(market.data.midPrice)
+                      .toString(),
+                    market.decimalPlaces
+                  )} ${quoteUnit}`,
+                highestPrice:
+                  market.data?.midPrice &&
+                  `${addDecimalsFormatNumber(
+                    new BigNumber(1)
+                      .plus(market.lpPriceRange)
+                      .times(market.data.midPrice)
+                      .toString(),
+                    market.decimalPlaces
+                  )} ${quoteUnit}`,
+              }}
+            ></MarketInfoTable>
+          </div>
         </>
       ),
     },
diff --git a/libs/react-helpers/src/lib/format/number.spec.tsx b/libs/react-helpers/src/lib/format/number.spec.tsx
index 0dccbc44b..21a6bdb4d 100644
--- a/libs/react-helpers/src/lib/format/number.spec.tsx
+++ b/libs/react-helpers/src/lib/format/number.spec.tsx
@@ -6,6 +6,7 @@ import {
   formatNumber,
   formatNumberPercentage,
   isNumeric,
+  toDecimal,
   toNumberParts,
 } from './number';
 
@@ -197,3 +198,20 @@ describe('compactNumber', () => {
     }
   );
 });
+
+describe('toDecimal', () => {
+  it.each([
+    { v: 0, o: '1' },
+    { v: 1, o: '0.1' },
+    { v: 2, o: '0.01' },
+    { v: 3, o: '0.001' },
+    { v: 4, o: '0.0001' },
+    { v: 5, o: '0.00001' },
+    { v: 6, o: '0.000001' },
+    { v: 7, o: '0.0000001' },
+    { v: 8, o: '0.00000001' },
+    { v: 9, o: '0.000000001' },
+  ])('formats with toNumber given number correctly', ({ v, o }) => {
+    expect(toDecimal(v)).toStrictEqual(o);
+  });
+});
diff --git a/libs/ui-toolkit/src/components/form-group/form-group.tsx b/libs/ui-toolkit/src/components/form-group/form-group.tsx
index 0ad57fc65..1242aea9f 100644
--- a/libs/ui-toolkit/src/components/form-group/form-group.tsx
+++ b/libs/ui-toolkit/src/components/form-group/form-group.tsx
@@ -20,7 +20,7 @@ export const FormGroup = ({
   labelAlign = 'left',
   hideLabel = false,
 }: FormGroupProps) => {
-  const wrapperClasses = classNames('relative mb-6', className);
+  const wrapperClasses = classNames('relative mb-2', className);
   const labelClasses = classNames('block mb-2 text-sm', {
     'text-right': labelAlign === 'right',
     'sr-only': hideLabel,
diff --git a/libs/ui-toolkit/src/components/key-value-table/key-value-table.tsx b/libs/ui-toolkit/src/components/key-value-table/key-value-table.tsx
index 639cbaf57..c46a3183d 100644
--- a/libs/ui-toolkit/src/components/key-value-table/key-value-table.tsx
+++ b/libs/ui-toolkit/src/components/key-value-table/key-value-table.tsx
@@ -24,11 +24,7 @@ export const KeyValueTable = ({
   return (
     <React.Fragment>
       {title && <TitleTag className={`text-xl my-2`}>{title}</TitleTag>}
-      <div
-        data-testid="key-value-table"
-        {...rest}
-        className={classNames('mb-4', className)}
-      >
+      <div data-testid="key-value-table" {...rest} className={className}>
         <div>
           {children &&
             React.Children.map(

From 69a0830e80183dd80483b57f34b779cf8a750d3d Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Mon, 27 Feb 2023 15:21:17 -0800
Subject: [PATCH 4/8] fix(ui-toolkit): remove calt from nav and toasts (#3020)

---
 libs/ui-toolkit/src/components/nav/nav.tsx     | 2 +-
 libs/ui-toolkit/src/components/toast/toast.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ui-toolkit/src/components/nav/nav.tsx b/libs/ui-toolkit/src/components/nav/nav.tsx
index 80eed0617..5b2e19ae8 100644
--- a/libs/ui-toolkit/src/components/nav/nav.tsx
+++ b/libs/ui-toolkit/src/components/nav/nav.tsx
@@ -50,7 +50,7 @@ export const Nav = ({
   title,
 }: NavbarProps) => {
   const themeWrapperClasses = classNames(
-    'w-full overflow-y-hidden overflow-x-auto md:overflow-x-hidden font-alpha calt lg:text-lg',
+    'w-full overflow-y-hidden overflow-x-auto md:overflow-x-hidden font-alpha lg:text-lg',
     {
       dark: navbarTheme === 'dark',
     }
diff --git a/libs/ui-toolkit/src/components/toast/toast.tsx b/libs/ui-toolkit/src/components/toast/toast.tsx
index c8aaafcbe..5cbc7126b 100644
--- a/libs/ui-toolkit/src/components/toast/toast.tsx
+++ b/libs/ui-toolkit/src/components/toast/toast.tsx
@@ -155,7 +155,7 @@ export const Toast = ({
         'w-[320px] rounded-md overflow-hidden',
         'shadow-[8px_8px_16px_0_rgba(0,0,0,0.4)]',
         'text-black dark:text-white',
-        'font-alpha calt text-[14px] leading-[19px]',
+        'font-alpha text-[14px] leading-[19px]',
         // background
         {
           'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None,

From 26a82ab2aba36cf1ef1a51ea64d0319aaa4047ff Mon Sep 17 00:00:00 2001
From: dexturr <dexturr@users.noreply.github.com>
Date: Tue, 28 Feb 2023 00:17:25 +0000
Subject: [PATCH 5/8] chore: update tranches

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 apps/static/src/assets/mainnet-tranches.json | 121 ++++++++++++++-----
 1 file changed, 88 insertions(+), 33 deletions(-)

diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json
index 5a7d0565d..46cc39763 100644
--- a/apps/static/src/assets/mainnet-tranches.json
+++ b/apps/static/src/assets/mainnet-tranches.json
@@ -2761,7 +2761,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "66600.6885662553549491123",
+    "locked_amount": "66480.8655951906369741346",
     "deposits": [
       {
         "amount": "86666.297",
@@ -2827,7 +2827,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "1284.23843228530725",
+    "locked_amount": "1277.3065476190475",
     "deposits": [
       {
         "amount": "2500",
@@ -3214,8 +3214,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "3295.491386325",
-    "locked_amount": "32008.126630601595",
+    "total_removed": "3376.096819125",
+    "locked_amount": "31903.573895027625",
     "deposits": [
       {
         "amount": "7500",
@@ -3234,6 +3234,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xe69c28fbcb90092d264d098874523f580e45052a36a71b3f423431e84d4ca074"
       },
+      {
+        "amount": "80.6054328",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x1a73c48a20c37eb5f8214ecb3c1986d0b6a24ae6472533c556ec6c264814abb6"
+      },
       {
         "amount": "142.173112275",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -3288,6 +3293,12 @@
             "tranche_id": 34,
             "tx": "0xe69c28fbcb90092d264d098874523f580e45052a36a71b3f423431e84d4ca074"
           },
+          {
+            "amount": "80.6054328",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x1a73c48a20c37eb5f8214ecb3c1986d0b6a24ae6472533c556ec6c264814abb6"
+          },
           {
             "amount": "142.173112275",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -3326,8 +3337,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "1020.378203625",
-        "remaining_tokens": "6479.621796375"
+        "withdrawn_tokens": "1100.983636425",
+        "remaining_tokens": "6399.016363575"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -3359,7 +3370,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "66539.923817958609949455",
+    "locked_amount": "66420.21017027829087102",
     "deposits": [
       {
         "amount": "129999.45",
@@ -3425,7 +3436,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "32156.25787037037408",
+    "locked_amount": "32069.70844748858316",
     "deposits": [
       {
         "amount": "10000",
@@ -3618,7 +3629,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2760.1720256215125",
+    "locked_amount": "2753.2591324200915",
     "deposits": [
       {
         "amount": "5000",
@@ -3829,7 +3840,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "8491.6684140496565878092",
+    "locked_amount": "8374.240477505965047441",
     "deposits": [
       {
         "amount": "97499.58",
@@ -3862,7 +3873,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "11606.644696613363239057508256",
+    "locked_amount": "11446.140980445631838252066712",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -3908,7 +3919,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "3572.2982585208873489478",
+    "locked_amount": "3522.8983534889545598448",
     "deposits": [
       {
         "amount": "32499.86",
@@ -3941,7 +3952,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "1162.7484183867779537778",
+    "locked_amount": "1146.6692286642158370909",
     "deposits": [
       {
         "amount": "10833.29",
@@ -3974,7 +3985,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "4346.6132830988218703751",
+    "locked_amount": "4286.5056806937171194682",
     "deposits": [
       {
         "amount": "6500",
@@ -4125,8 +4136,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "4832.532899775",
-    "locked_amount": "7768.411889963167125",
+    "total_removed": "4913.13257745",
+    "locked_amount": "7705.680248618784",
     "deposits": [
       {
         "amount": "7500",
@@ -4145,6 +4156,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xe098f85d049dae2f5ab1d8057e7ca1d1a02bc6c95602a8db87e2d78013e236a3"
       },
+      {
+        "amount": "80.599677675",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xe5b0236fdb114d861139db0bdec5bdc26b4e107ff73eb66bc4ba262a003fd872"
+      },
       {
         "amount": "142.17311235",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4254,6 +4270,12 @@
             "tranche_id": 33,
             "tx": "0xe098f85d049dae2f5ab1d8057e7ca1d1a02bc6c95602a8db87e2d78013e236a3"
           },
+          {
+            "amount": "80.599677675",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xe5b0236fdb114d861139db0bdec5bdc26b4e107ff73eb66bc4ba262a003fd872"
+          },
           {
             "amount": "142.17311235",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4364,8 +4386,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "4832.532899775",
-        "remaining_tokens": "2667.467100225"
+        "withdrawn_tokens": "4913.13257745",
+        "remaining_tokens": "2586.86742255"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -4390,7 +4412,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "502215.87592198306198629",
+    "locked_amount": "499533.7723801142609285186",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -36770,7 +36792,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "615950.831401702010493",
-    "locked_amount": "796232.273024709558568810279",
+    "locked_amount": "792110.813690129738583212707",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -38118,8 +38140,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "581409.88924190582035452",
-    "locked_amount": "8123076.1027882686093883722947201633400919",
+    "total_removed": "581783.18955280438622952",
+    "locked_amount": "8108461.6726108303944506865771837752311436",
     "deposits": [
       {
         "amount": "16249.93",
@@ -38638,6 +38660,11 @@
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
         "tx": "0x525f9427c131bc2fdea7f556d16b7781faaa41e09c7735d1c02d1f7585cc49ab"
       },
+      {
+        "amount": "373.300310898565875",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x9e97de704d81fdca889591198e04f05367514f11f4a1eddcbd6363aadb861955"
+      },
       {
         "amount": "535.4042378778335",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -40413,6 +40440,12 @@
             "tranche_id": 2,
             "tx": "0x2d99d4051c6ac81037db1eebf0f86b335ed9d1957f281134d07da192644a6a8c"
           },
+          {
+            "amount": "373.300310898565875",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x9e97de704d81fdca889591198e04f05367514f11f4a1eddcbd6363aadb861955"
+          },
           {
             "amount": "535.4042378778335",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -41627,8 +41660,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "126575.552865965027",
-        "remaining_tokens": "133423.334634034973"
+        "withdrawn_tokens": "126948.853176863592875",
+        "remaining_tokens": "133050.034323136407125"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -43871,8 +43904,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5576016.212508497282613906",
-    "locked_amount": "1777726.765473197066260457387430519",
+    "total_removed": "5576533.539587892391509156",
+    "locked_amount": "1764234.816847403898242599712098974",
     "deposits": [
       {
         "amount": "129284.449",
@@ -44091,6 +44124,11 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0xb4d9a135d2cfa85e52b9bb68a09ffaecde4ae4d1fab95e6f44d4dd902e2a45c9"
       },
+      {
+        "amount": "517.32707939510889525",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x07f42fed87b386a135f1b3be72112768a812687d6751cfd74e287ed3af3c16b7"
+      },
       {
         "amount": "800.792718381487871",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -47058,6 +47096,12 @@
             "tranche_id": 3,
             "tx": "0xb4d9a135d2cfa85e52b9bb68a09ffaecde4ae4d1fab95e6f44d4dd902e2a45c9"
           },
+          {
+            "amount": "517.32707939510889525",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x07f42fed87b386a135f1b3be72112768a812687d6751cfd74e287ed3af3c16b7"
+          },
           {
             "amount": "800.792718381487871",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -49574,8 +49618,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "314913.2361779904076005",
-        "remaining_tokens": "44210.2333970095923995"
+        "withdrawn_tokens": "315430.56325738551649575",
+        "remaining_tokens": "43692.90631761448350425"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -50918,8 +50962,8 @@
     "tranche_start": "2021-10-05T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
-    "total_removed": "3055768.040200763217391295",
-    "locked_amount": "385487.193100244108102591696423251",
+    "total_removed": "3063522.787392713967070295",
+    "locked_amount": "380156.442599566465756883681589906",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -51063,6 +51107,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "7754.747191950749679",
+        "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
+        "tx": "0xb1d21b6f9cce4bfaf8870592e4cbc7a40f1ca7c13cd7c8c8bb1defeb49bc31b8"
+      },
       {
         "amount": "990.74735267405816",
         "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
@@ -52606,6 +52655,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "7754.747191950749679",
+            "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
+            "tranche_id": 4,
+            "tx": "0xb1d21b6f9cce4bfaf8870592e4cbc7a40f1ca7c13cd7c8c8bb1defeb49bc31b8"
+          },
           {
             "amount": "4961.957448767374506",
             "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -52854,8 +52909,8 @@
           }
         ],
         "total_tokens": "331498.5873",
-        "withdrawn_tokens": "301699.732563421740393",
-        "remaining_tokens": "29798.854736578259607"
+        "withdrawn_tokens": "309454.479755372490072",
+        "remaining_tokens": "22044.107544627509928"
       },
       {
         "address": "0x16da609341ed67750A8BCC5AAa2005471006Cd77",
@@ -52958,7 +53013,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "34416.2282090650685",
-    "locked_amount": "126167.555118478468636691490005064",
+    "locked_amount": "125514.48632764829726385614611872",
     "deposits": [
       {
         "amount": "3000",

From 1cab9abfd53f8c8db3ee5be0efa5d645adf6198f Mon Sep 17 00:00:00 2001
From: dexturr <dexturr@users.noreply.github.com>
Date: Tue, 28 Feb 2023 06:08:01 +0000
Subject: [PATCH 6/8] chore: update tranches

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 apps/static/src/assets/mainnet-tranches.json | 68 +++++++++++++-------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/apps/static/src/assets/mainnet-tranches.json b/apps/static/src/assets/mainnet-tranches.json
index 46cc39763..b10594895 100644
--- a/apps/static/src/assets/mainnet-tranches.json
+++ b/apps/static/src/assets/mainnet-tranches.json
@@ -2761,7 +2761,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "66480.8655951906369741346",
+    "locked_amount": "66423.0550858143113891258",
     "deposits": [
       {
         "amount": "86666.297",
@@ -2827,7 +2827,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "1277.3065476190475",
+    "locked_amount": "1273.962148962149",
     "deposits": [
       {
         "amount": "2500",
@@ -3215,7 +3215,7 @@
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
     "total_removed": "3376.096819125",
-    "locked_amount": "31903.573895027625",
+    "locked_amount": "31853.1307550644575",
     "deposits": [
       {
         "amount": "7500",
@@ -3370,7 +3370,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "66420.21017027829087102",
+    "locked_amount": "66362.45240571775784592",
     "deposits": [
       {
         "amount": "129999.45",
@@ -3436,7 +3436,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "32069.70844748858316",
+    "locked_amount": "32027.95129375950986",
     "deposits": [
       {
         "amount": "10000",
@@ -3629,7 +3629,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2753.2591324200915",
+    "locked_amount": "2749.923896499239",
     "deposits": [
       {
         "amount": "5000",
@@ -3840,7 +3840,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "8374.240477505965047441",
+    "locked_amount": "8317.5854908512324839724",
     "deposits": [
       {
         "amount": "97499.58",
@@ -3873,7 +3873,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "11446.140980445631838252066712",
+    "locked_amount": "11368.703394764008547704146912",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -3919,7 +3919,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "3522.8983534889545598448",
+    "locked_amount": "3499.0645789825988556482",
     "deposits": [
       {
         "amount": "32499.86",
@@ -3952,7 +3952,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "1146.6692286642158370909",
+    "locked_amount": "1138.9115663398697575689",
     "deposits": [
       {
         "amount": "10833.29",
@@ -3985,7 +3985,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "4720.860935375",
-    "locked_amount": "4286.5056806937171194682",
+    "locked_amount": "4257.5058062827227483966",
     "deposits": [
       {
         "amount": "6500",
@@ -4137,7 +4137,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "4913.13257745",
-    "locked_amount": "7705.680248618784",
+    "locked_amount": "7675.414364640885075",
     "deposits": [
       {
         "amount": "7500",
@@ -4412,7 +4412,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "499533.7723801142609285186",
+    "locked_amount": "498239.748616742685424742",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -36792,7 +36792,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "615950.831401702010493",
-    "locked_amount": "792110.813690129738583212707",
+    "locked_amount": "790122.349697050685985728513",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -38141,7 +38141,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
     "total_removed": "581783.18955280438622952",
-    "locked_amount": "8108461.6726108303944506865771837752311436",
+    "locked_amount": "8101410.7069629630393713585116348828548256",
     "deposits": [
       {
         "amount": "16249.93",
@@ -43905,7 +43905,7 @@
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
     "total_removed": "5576533.539587892391509156",
-    "locked_amount": "1764234.816847403898242599712098974",
+    "locked_amount": "1757725.410382134892287839107650954",
     "deposits": [
       {
         "amount": "129284.449",
@@ -50963,7 +50963,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "3063522.787392713967070295",
-    "locked_amount": "380156.442599566465756883681589906",
+    "locked_amount": "377584.536736576014422212956155541",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -53012,8 +53012,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "34416.2282090650685",
-    "locked_amount": "125514.48632764829726385614611872",
+    "total_removed": "34799.2735287010685",
+    "locked_amount": "125199.40284140018681746501978692",
     "deposits": [
       {
         "amount": "3000",
@@ -59647,6 +59647,16 @@
         "user": "0x7708B79e2bc3b7ab816E66aF33A8c9385f0FcA4b",
         "tx": "0x1c5bff9afd9ddc3c385d5a089f9784606b0bac24e59dba9f16e1445e52a9c41b"
       },
+      {
+        "amount": "191.524581432",
+        "user": "0x256274a216e0a349dC18cae08Ca45631176AF437",
+        "tx": "0xdc17c6673a771c209d6a3f8aaf89d12289034073da28c19047ff704b1fbf4fe2"
+      },
+      {
+        "amount": "191.520738204",
+        "user": "0xB3ae40b11af91BbD456022Bd42B4f36A8C0AEA9D",
+        "tx": "0x7d1caeef005902492763cabe888b5dc76fd9f224520323ac30c1927ae91a1778"
+      },
       {
         "amount": "57.900076104",
         "user": "0x96d882E908C06cD697Ea07266Fb8D14ae129A50b",
@@ -81556,6 +81566,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "191.520738204",
+            "user": "0xB3ae40b11af91BbD456022Bd42B4f36A8C0AEA9D",
+            "tranche_id": 5,
+            "tx": "0x7d1caeef005902492763cabe888b5dc76fd9f224520323ac30c1927ae91a1778"
+          },
           {
             "amount": "102.196144088",
             "user": "0xB3ae40b11af91BbD456022Bd42B4f36A8C0AEA9D",
@@ -81564,8 +81580,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "102.196144088",
-        "remaining_tokens": "297.803855912"
+        "withdrawn_tokens": "293.716882292",
+        "remaining_tokens": "106.283117708"
       },
       {
         "address": "0x256274a216e0a349dC18cae08Ca45631176AF437",
@@ -81578,6 +81594,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "191.524581432",
+            "user": "0x256274a216e0a349dC18cae08Ca45631176AF437",
+            "tranche_id": 5,
+            "tx": "0xdc17c6673a771c209d6a3f8aaf89d12289034073da28c19047ff704b1fbf4fe2"
+          },
           {
             "amount": "102.190930996",
             "user": "0x256274a216e0a349dC18cae08Ca45631176AF437",
@@ -81586,8 +81608,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "102.190930996",
-        "remaining_tokens": "297.809069004"
+        "withdrawn_tokens": "293.715512428",
+        "remaining_tokens": "106.284487572"
       },
       {
         "address": "0xB0473C4FeBd722a6d7eE561329d3134030318132",

From a985bc73171c2af16fe00109a4621fdc0eaa6d8e Mon Sep 17 00:00:00 2001
From: Sam Keen <samuel@vegaprotocol.io>
Date: Tue, 28 Feb 2023 10:07:51 +0000
Subject: [PATCH 7/8] fix(governance): some fixes and tweaks for the rewards
 tables (#3009)

---
 .../epoch-individual-rewards-table.tsx        |  5 +--
 ...rate-epoch-individual-rewards-list.spec.ts | 34 +++++++++----------
 .../generate-epoch-individual-rewards-list.ts |  8 ++++-
 .../generate-epoch-total-rewards-list.ts      |  5 ++-
 .../src/routes/rewards/home/Rewards.graphql   |  1 +
 .../rewards/home/__generated__/Rewards.ts     |  5 +--
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/apps/token/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx b/apps/token/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx
index 60f9affb2..3a38e8098 100644
--- a/apps/token/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx
+++ b/apps/token/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx
@@ -50,10 +50,11 @@ const DisplayReward = ({
     >
       <button>
         <div className="flex flex-col items-start">
-          <span>{formatNumber(toBigNum(reward, decimals))}</span>
+          <span>{formatNumber(toBigNum(reward, decimals), 4)}</span>
           {percentageOfTotal && (
             <span className="text-vega-dark-300">
-              ({formatNumber(toBigNum(percentageOfTotal, 4)).toString()}%)
+              ({formatNumber(percentageOfTotal, 4).toString()}
+              %)
             </span>
           )}
         </div>
diff --git a/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts b/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts
index 9ac901f4f..f0e390136 100644
--- a/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts
+++ b/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts
@@ -8,7 +8,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD' },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
@@ -18,7 +18,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR' },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -28,7 +28,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '200',
     percentageOfTotal: '0.2',
     receivedAt: new Date(),
-    asset: { id: 'gbp', symbol: 'GBP' },
+    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -38,7 +38,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD' },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
@@ -48,7 +48,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR' },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -134,20 +134,20 @@ describe('generateEpochIndividualRewardsList', () => {
         epoch: '2',
         rewards: [
           {
-            asset: 'EUR',
-            totalAmount: '50',
+            asset: 'GBP',
+            totalAmount: '200',
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
               [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '0',
-                percentageOfTotal: '0',
+                amount: '200',
+                percentageOfTotal: '0.2',
               },
               [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-                amount: '50',
-                percentageOfTotal: '0.05',
+                amount: '0',
+                percentageOfTotal: '0',
               },
               [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
                 amount: '0',
@@ -164,21 +164,21 @@ describe('generateEpochIndividualRewardsList', () => {
             },
           },
           {
-            asset: 'GBP',
-            totalAmount: '200',
+            asset: 'EUR',
+            totalAmount: '50',
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
               [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
-                amount: '200',
-                percentageOfTotal: '0.2',
-              },
-              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
+              [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+                amount: '50',
+                percentageOfTotal: '0.05',
+              },
               [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
                 amount: '0',
                 percentageOfTotal: '0',
diff --git a/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts b/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts
index 712d9f5c5..285afa1a2 100644
--- a/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts
+++ b/apps/token/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts
@@ -33,7 +33,7 @@ export const generateEpochIndividualRewardsList = (
   // We take the rewards and aggregate them by epoch and asset.
   const epochIndividualRewards = rewards.reduce((map, reward) => {
     const epochId = reward.epoch.id;
-    const assetName = reward.asset.symbol;
+    const assetName = reward.asset.name;
     const rewardType = reward.rewardType;
     const amount = reward.amount;
     const percentageOfTotal = reward.percentageOfTotal;
@@ -70,6 +70,12 @@ export const generateEpochIndividualRewardsList = (
       '0'
     );
 
+    if (epoch) {
+      epoch.rewards = epoch.rewards.sort((a, b) => {
+        return new BigNumber(b.totalAmount).comparedTo(a.totalAmount);
+      });
+    }
+
     return map;
   }, new Map<string, EpochIndividualReward>());
 
diff --git a/apps/token/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts b/apps/token/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts
index 35407846c..dc35bf97a 100644
--- a/apps/token/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts
+++ b/apps/token/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts
@@ -5,6 +5,7 @@ import type {
 import { removePaginationWrapper } from '@vegaprotocol/react-helpers';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { AccountType } from '@vegaprotocol/types';
+import { BigNumber } from '../../../lib/bignumber';
 
 interface EpochSummaryWithNamedReward extends EpochRewardSummaryFieldsFragment {
   name: string;
@@ -120,7 +121,9 @@ export const generateEpochTotalRewardsList = (
 
       return {
         epoch: epochSummaries[0].epoch,
-        assetRewards,
+        assetRewards: assetRewards.sort((a, b) => {
+          return new BigNumber(b.totalAmount).comparedTo(a.totalAmount);
+        }),
       };
     });
 
diff --git a/apps/token/src/routes/rewards/home/Rewards.graphql b/apps/token/src/routes/rewards/home/Rewards.graphql
index ec4e71345..0959973e8 100644
--- a/apps/token/src/routes/rewards/home/Rewards.graphql
+++ b/apps/token/src/routes/rewards/home/Rewards.graphql
@@ -3,6 +3,7 @@ fragment RewardFields on Reward {
   asset {
     id
     symbol
+    name
   }
   party {
     id
diff --git a/apps/token/src/routes/rewards/home/__generated__/Rewards.ts b/apps/token/src/routes/rewards/home/__generated__/Rewards.ts
index 1d48da049..5242823d1 100644
--- a/apps/token/src/routes/rewards/home/__generated__/Rewards.ts
+++ b/apps/token/src/routes/rewards/home/__generated__/Rewards.ts
@@ -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 RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
+export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
 
 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };
 
@@ -13,7 +13,7 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;
 
 
-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };
 
 export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
 
@@ -37,6 +37,7 @@ export const RewardFieldsFragmentDoc = gql`
   asset {
     id
     symbol
+    name
   }
   party {
     id

From 1bd56c9bdb7a0efdaddf7550e64de467f112c4f2 Mon Sep 17 00:00:00 2001
From: Ciaran McGhie <ciaran@softbrew.io>
Date: Tue, 28 Feb 2023 10:13:51 +0000
Subject: [PATCH 8/8] chore(ci): bump ui-toolkit version to 0.7.0  (#2961)

---
 libs/ui-toolkit/package.json | 2 +-
 package.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/ui-toolkit/package.json b/libs/ui-toolkit/package.json
index 1cf3c7443..2db4f5996 100644
--- a/libs/ui-toolkit/package.json
+++ b/libs/ui-toolkit/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/ui-toolkit",
-  "version": "0.0.1"
+  "version": "0.7.0"
 }
diff --git a/package.json b/package.json
index a0a4221d8..6a6ef04f9 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "vegacapsule": "vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl"
   },
   "engines": {
-    "node": ">=16.14.0"
+    "node": ">=16.15.1"
   },
   "private": true,
   "dependencies": {