Merge branch 'develop' into drew/favicons

tangle-network · Sep 29, 2023 · 4b7df3a · 4b7df3a
2 parents 1d5c396 + 5139bf4
commit 4b7df3a
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 8 deletions.
diff --git a/.lycheeignore b/.lycheeignore
@@ -20,7 +20,9 @@ https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.13
 https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.14
 https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.15
 https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.16
+https://github.com/webb-tools/webb-dapp/releases/tag/v0.0.17
 https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.0
 https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.1
 https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.2
 https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.3
+https://github.com/webb-tools/webb-dapp/releases/tag/v1.0.4
diff --git a/apps/bridge-dapp/CHANGELOG.md b/apps/bridge-dapp/CHANGELOG.md
@@ -186,3 +186,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed, Changed and Added
 
 - Iterative Improvement For Hubble Bridge ([#1662](https://github.com/webb-tools/webb-dapp/pull/1662))
+
+## [1.0.4] - 2023-09-30
+
+### Fixed, Changed and Added
+
+- Content fixes, spelling fix ([#1685](https://github.com/webb-tools/webb-dapp/pull/1695))
+- Updates bridge header dropdown menu items ([#1701](https://github.com/webb-tools/webb-dapp/pull/1701))
+- Remove forced goerli connection on wallet reconnect ([#1709](https://github.com/webb-tools/webb-dapp/pull/1709))
+- Fix warning badge 0 balance state ([#1715](https://github.com/webb-tools/webb-dapp/pull/1715))
+- Sort all non-active chains alphabetically ([#1716](https://github.com/webb-tools/webb-dapp/pull/1716))
diff --git a/apps/bridge-dapp/package.json b/apps/bridge-dapp/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@webb-tools/bridge-dapp",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "./src/index.js"
 }
diff --git a/apps/bridge-dapp/src/pages/Hubble/Bridge/SelectToken.tsx b/apps/bridge-dapp/src/pages/Hubble/Bridge/SelectToken.tsx
@@ -150,7 +150,7 @@ const getBalanceProps = (
   balances[currencyCfg.id] &&
   (txType !== 'withdraw' || currencyCfg.role !== CurrencyRole.Governable)
     ? { balance: balances[currencyCfg.id] }
-    : undefined;
+    : { balance: 0 };
 
 const getBadgeProps = (
   currencyCfg: CurrencyConfig,

diff --git a/apps/hubble-stats/CHANGELOG.md b/apps/hubble-stats/CHANGELOG.md
@@ -58,3 +58,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix current major issues on Hubble Stats ([#1651](https://github.com/webb-tools/webb-dapp/pull/1651))
 - Fix chart tooltip bug ([#1664](https://github.com/webb-tools/webb-dapp/pull/1664))
+
+## [0.0.4] - 2023-09-30
+
+### Chaged, Added and Fixed
+
+- Upgrade next apps to latest version to support adding features and fixing bugs ([#1684](https://github.com/webb-tools/webb-dapp/pull/1684))
+- Add metadata in layout in Hubble Stats ([#1688](https://github.com/webb-tools/webb-dapp/pull/1688))
diff --git a/apps/hubble-stats/package.json b/apps/hubble-stats/package.json
@@ -1,4 +1,4 @@
 {
   "name": "@webb-tools/hubble-stats",
-  "version": "0.0.3"
+  "version": "0.0.4"
 }
diff --git a/apps/stats-dapp/CHANGELOG.md b/apps/stats-dapp/CHANGELOG.md
@@ -154,3 +154,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed, Changed and Added
 
 - DKG stats-dapp QA (Sept 13, 2023) fixes part 1 ([#1639](https://github.com/webb-tools/webb-dapp/pull/1639))
+
+## [0.0.17] - 2023-09-30
+
+### Fixed, Changed and Added
+
+- Show chain name in proposal detail ([#1689](https://github.com/webb-tools/webb-dapp/pull/1689))
+- Fix prev session's active period incorrect progress bar ([#1713](https://github.com/webb-tools/webb-dapp/pull/1713))
diff --git a/apps/stats-dapp/package.json b/apps/stats-dapp/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@webb-tools/stats-dapp",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "main": "./src/index.js"
 }
diff --git a/libs/webb-ui-components/src/components/ListCard/ChainListCard.tsx b/libs/webb-ui-components/src/components/ListCard/ChainListCard.tsx
@@ -100,22 +100,24 @@ const ChainListCard = forwardRef<HTMLDivElement, ChainListCardProps>(
     // Move the current active chain to the top of the list
     const sortedChains = useMemo(() => {
       if (!currentActiveChain) {
-        return filteredChains;
+        return filteredChains.sort((a, b) => a.name.localeCompare(b.name));
       }
 
       const currentActiveChainIndex = filteredChains.findIndex(
         (chain) => chain.name === currentActiveChain
       );
 
       if (currentActiveChainIndex === -1) {
-        return filteredChains;
+        return filteredChains.sort((a, b) => a.name.localeCompare(b.name));
       }
 
       const activeChain = filteredChains[currentActiveChainIndex];
 
       return [
         activeChain,
-        ...filteredChains.filter((chain) => chain.name !== activeChain.name),
+        ...filteredChains
+          .filter((chain) => chain.name !== activeChain.name)
+          .sort((a, b) => a.name.localeCompare(b.name)),
       ];
     }, [currentActiveChain, filteredChains]);
 
@@ -150,7 +152,7 @@ const ChainListCard = forwardRef<HTMLDivElement, ChainListCardProps>(
           />
         </div>
 
-        {/** Token list */}
+        {/** Chain list */}
         <ScrollArea
           {...overrideScrollAreaProps}
           className={twMerge(