Merge pull request #665 from Sifchain/staging

[hotfix] v2.6.19
Sifchain · May 13, 2022 · d962db7 · d962db7 · vercel · May 13, 2022
2 parents b09fdcc + 2028c3e
commit d962db7
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 4 deletions.
diff --git a/app/CHANGELOG.md b/app/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Release 2022.05.12
+
+- Decomission UST and LUNA
+
 ## Release 2022.05.09
 
 - Add more information about price impact on Swap's confirmation step

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "2.6.18",
+  "version": "2.6.19",
   "private": true,
   "scripts": {
     "bump": "bump patch --tag --commit 'testnet release '",

diff --git a/app/src/hooks/useToken.ts b/app/src/hooks/useToken.ts
@@ -78,6 +78,7 @@ export const useTokenList = (params: TokenListParams) => {
           if (params.showDecomissionedAssets) {
             return true;
           }
+
           return (
             params.showDecomissionedAssetsWithBalance &&
             parseFloat(token.amount.amount.toString()) > 0

diff --git a/app/src/store/modules/flags.ts b/app/src/store/modules/flags.ts
@@ -11,8 +11,13 @@ export const isChainFlaggedDisabled = (chain: Chain) => {
   );
 };
 
+const DISABLED_ASSETS: string[] = [];
+
 export const isAssetFlaggedDisabled = (asset: IAsset) => {
   if (!asset.homeNetwork) return false;
+  if (DISABLED_ASSETS.includes(asset.symbol.toLowerCase())) {
+    return false;
+  }
   return isChainFlaggedDisabled(useChains().get(asset.homeNetwork));
 };
 
@@ -32,7 +37,7 @@ export const flagsStore = Vuextra.createStore({
     allowEmptyLiquidityAdd: false,
     voting: true,
     enableTestChains: {
-      // band: false,
+      // terra: false,
       // likecoin: false,
     },
     balancePageV2: true,

diff --git a/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts b/core/src/config/networks/sifchain/assets.sifchain.mainnet.ts
@@ -877,6 +877,8 @@ const assets: ChainAssetConfig = {
       imageUrl:
         "https://assets.coingecko.com/coins/images/8284/small/luna1557227471663.png?1567147072",
       homeNetwork: "terra",
+      decommissioned: true,
+      decommissionReason: "Temporarily decomissioned due to Terra instability",
     },
     {
       symbol: "uusd",
@@ -888,6 +890,8 @@ const assets: ChainAssetConfig = {
       imageUrl:
         "https://assets.coingecko.com/coins/images/12681/small/UST.png?1601612407",
       homeNetwork: "terra",
+      decommissioned: true,
+      decommissionReason: "Temporarily decomissioned due to Terra instability",
     },
     {
       address: "0x05079687d35b93538cbd59fe5596380cae9054a9",

diff --git a/core/src/entities/Asset.ts b/core/src/entities/Asset.ts
@@ -14,7 +14,7 @@ export type IAsset = {
   label?: string;
   hasDarkIcon?: boolean;
   homeNetwork: Network;
-  decommissioned?: true;
+  decommissioned?: boolean;
   decommissionReason?: string;
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sifchain-ui",
-  "version": "2.6.18",
+  "version": "2.6.19",
   "private": true,
   "license": "UNLICENSED",
   "packageManager": "[email protected]",