Merge pull request #236 from alleslabs/fix/funds-sort

fix: sort json attach funds

CHANGELOG.md

@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#236](https://github.com/alleslabs/celatone-frontend/pull/236) Add alphabetically sorting to JSON attach funds
 - [#231](https://github.com/alleslabs/celatone-frontend/pull/231) Fix double slash for endpoint, disable calling endpoint when there is no contract addr in contract details page
 - [#229](https://github.com/alleslabs/celatone-frontend/pull/229) Disable Sentry debug to prevent "logger.info is not a function" error
 - [#219](https://github.com/alleslabs/celatone-frontend/pull/219) Fix asset value and price formatter

src/lib/utils/funds.ts

@@ -4,13 +4,15 @@ import type { Token } from "lib/types";
 
 import { microfy } from "./formatter/currency";
 
+export const sortDenoms = (assets: Coin[]): Coin[] =>
+  assets.sort(({ denom: aDenom }, { denom: bDenom }) =>
+    aDenom.localeCompare(bDenom)
+  );
+
 export const fabricateFunds = (assets: Coin[]): Coin[] =>
-  assets
-    .filter((asset) => Number(asset.amount) && asset.denom)
-    .sort(({ denom: aDenom }, { denom: bDenom }) =>
-      aDenom.localeCompare(bDenom)
-    )
-    .map((asset) => ({
+  sortDenoms(assets.filter((asset) => Number(asset.amount) && asset.denom)).map(
+    (asset) => ({
       ...asset,
       amount: microfy(asset.amount as Token).toFixed(0),
-    }));
+    })
+  );

src/lib/utils/getAttachFunds.ts

@@ -2,7 +2,7 @@ import type { Coin } from "@cosmjs/stargate";
 
 import { AttachFundsType } from "lib/components/fund/types";
 
-import { fabricateFunds } from "./funds";
+import { fabricateFunds, sortDenoms } from "./funds";
 
 interface AttachFundsParams {
   attachFundsOption: AttachFundsType;
@@ -21,7 +21,7 @@ export const getAttachFunds = ({
     case AttachFundsType.ATTACH_FUNDS_JSON:
       try {
         if (JSON.parse(assetsJsonStr)) {
-          return JSON.parse(assetsJsonStr) as Coin[];
+          return sortDenoms(JSON.parse(assetsJsonStr) as Coin[]);
         }
       } catch {
         return [];