From 487e23814e7f26c8ea696bc92869041f00a46c82 Mon Sep 17 00:00:00 2001
From: Evan Gray <battledingo@gmail.com>
Date: Mon, 18 Oct 2021 13:39:51 -0400
Subject: [PATCH] bridge_ui: fix tvl table bug

Change-Id: I1b111d0d364341dc82b1049a730523d708827de2
---
 bridge_ui/src/components/Stats/index.tsx                  | 8 +++++++-
 .../components/Stats/tableComponents/MuiReactTable.jsx    | 5 +++--
 sdk/js/CHANGELOG.md                                       | 8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bridge_ui/src/components/Stats/index.tsx b/bridge_ui/src/components/Stats/index.tsx
index fa51fdd5..ae452f91 100644
--- a/bridge_ui/src/components/Stats/index.tsx
+++ b/bridge_ui/src/components/Stats/index.tsx
@@ -75,7 +75,13 @@ const StatsRoot: React.FC<any> = () => {
   const tvl = useTVL();
   const sortTokens = useMemo(() => {
     return (rowA: any, rowB: any) => {
-      if (rowA.original.symbol && !rowB.original.symbol) {
+      if (rowA.isGrouped && rowB.isGrouped) {
+        return rowA.values.assetAddress > rowB.values.assetAddress ? 1 : -1;
+      } else if (rowA.isGrouped && !rowB.isGrouped) {
+        return 1;
+      } else if (!rowA.isGrouped && rowB.isGrouped) {
+        return -1;
+      } else if (rowA.original.symbol && !rowB.original.symbol) {
         return 1;
       } else if (rowB.original.symbol && !rowA.original.symbol) {
         return -1;
diff --git a/bridge_ui/src/components/Stats/tableComponents/MuiReactTable.jsx b/bridge_ui/src/components/Stats/tableComponents/MuiReactTable.jsx
index 6dae0f70..36dce925 100644
--- a/bridge_ui/src/components/Stats/tableComponents/MuiReactTable.jsx
+++ b/bridge_ui/src/components/Stats/tableComponents/MuiReactTable.jsx
@@ -36,6 +36,7 @@ const EnhancedTable = ({ columns, data, skipPageReset }) => {
     page,
     gotoPage,
     setPageSize,
+    rows,
     state: { pageIndex, pageSize },
   } = useTable(
     {
@@ -156,10 +157,10 @@ const EnhancedTable = ({ columns, data, skipPageReset }) => {
                   5,
                   10,
                   25,
-                  { label: "All", value: data.length },
+                  { label: "All", value: rows.length },
                 ]}
                 colSpan={columns.length}
-                count={data.length}
+                count={rows.length}
                 rowsPerPage={pageSize}
                 page={pageIndex}
                 SelectProps={{
diff --git a/sdk/js/CHANGELOG.md b/sdk/js/CHANGELOG.md
index 5fd3f39c..51e461c4 100644
--- a/sdk/js/CHANGELOG.md
+++ b/sdk/js/CHANGELOG.md
@@ -5,8 +5,11 @@
 ### Changed
 
 Allow separate payer and owner for Solana transfers
+
 Support multiple EVM chains
+
 Support native Terra tokens
+
 Fixed nft_bridge getForeignAssetEth
 
 ## 0.0.5
@@ -14,7 +17,9 @@ Fixed nft_bridge getForeignAssetEth
 ### Added
 
 NFT Bridge Support
+
 getClaimAddressSolana
+
 createMetaOnSolana
 
 ## 0.0.4
@@ -22,6 +27,7 @@ createMetaOnSolana
 ### Added
 
 redeemOnEthNative
+
 transferFromEthNative
 
 ## 0.0.3
@@ -29,11 +35,13 @@ transferFromEthNative
 ### Added
 
 Migration
+
 NFT Bridge
 
 ### Changed
 
 Fixed number overflow
+
 Fixed guardian set index
 
 ## 0.0.2