fix: dev tokens not showing in deploy previews part 2 (#464)

* fix: separately duality and dev assets without name changes

* fix: get both duality and dev assets to show in TokenPicker

* fix: add first dev token as fee token if available

* feat: remove hard-coded gas token, make consistent with bridging logic

src/lib/web3/hooks/useChains.ts

@@ -57,7 +57,7 @@ export const dualityChain: Chain = {
   // override default settings with an env variable for the whole chain config
   ...(REACT_APP__CHAIN ? (JSON.parse(REACT_APP__CHAIN) as Chain) : {}),
 };
-export const devChain = { ...dualityChain, chain_name: '___dev___' };
+export const devChain = { ...dualityChain };
 
 export const providerChain: Chain | undefined = REACT_APP__PROVIDER_CHAIN
   ? JSON.parse(REACT_APP__PROVIDER_CHAIN)

src/lib/web3/hooks/useTokens.ts

@@ -88,7 +88,7 @@ export const dualityAssets: AssetList | undefined = REACT_APP__CHAIN_ASSETS
   ? (JSON.parse(REACT_APP__CHAIN_ASSETS) as AssetList)
   : isTestnet
   ? {
-      chain_name: devChain.chain_name,
+      chain_name: dualityChain.chain_name,
       assets: [dualityStakeToken, dualityMainToken],
     }
   : undefined;
@@ -97,7 +97,7 @@ export const providerAssets: AssetList | undefined = REACT_APP__PROVIDER_ASSETS
   ? (JSON.parse(REACT_APP__PROVIDER_ASSETS) as AssetList)
   : undefined;
 
-const devAssets: AssetList | undefined = REACT_APP__DEV_ASSET_MAP
+export const devAssets: AssetList | undefined = REACT_APP__DEV_ASSET_MAP
   ? {
       chain_name: devChain.chain_name,
       assets: Object.entries(
@@ -188,7 +188,7 @@ export function useMainnetTokens(sortFunction = defaultSort) {
 }
 
 const dualityTokensFilter = (chain: Chain) =>
-  chain?.chain_id === 'duality' || chain === devChain;
+  chain.chain_id === dualityChain.chain_id;
 export function useDualityTokens(sortFunction = defaultSort) {
   tokenListCache['dualityTokens'] =
     tokenListCache['dualityTokens'] || getTokens(dualityTokensFilter);

src/lib/web3/wallets/keplr.ts

@@ -5,13 +5,14 @@ import { AccountData, OfflineSigner } from '@cosmjs/proto-signing';
 import { ChainInfo, Keplr, Window as KeplrWindow } from '@keplr-wallet/types';
 import { chainRegistryChainToKeplr } from '@chain-registry/keplr';
 import { dualityChain, providerChain } from '../hooks/useChains';
-import { dualityAssets, providerAssets } from '../hooks/useTokens';
+import { devAssets, dualityAssets, providerAssets } from '../hooks/useTokens';
+import { AssetList } from '@chain-registry/types';
 
 const { REACT_APP__CHAIN_ID: chainId = '' } = process.env;
 
 const chainInfo: ChainInfo = chainRegistryChainToKeplr(
   dualityChain,
-  dualityAssets ? [dualityAssets] : []
+  [devAssets, dualityAssets].filter((list): list is AssetList => !!list)
 );
 
 declare global {

src/pages/MyLiquidity/useEditLiquidity.ts

@@ -237,9 +237,7 @@ export function useEditLiquidity(): [
             ),
             {
               gas: gasEstimate.toFixed(0),
-              amount: [
-                { amount: (gasEstimate * 0.025).toFixed(0), denom: 'token' },
-              ],
+              amount: [],
             },
             ''
           );

src/pages/MyLiquidity/useStaking.ts

@@ -137,9 +137,7 @@ export function useStake(): [
             ],
             {
               gas: gasEstimate.toFixed(0),
-              amount: [
-                { amount: (gasEstimate * 0.025).toFixed(0), denom: 'token' },
-              ],
+              amount: [],
             },
             ''
           );

src/pages/Pool/useDeposit.ts

@@ -274,9 +274,7 @@ export function useDeposit([tokenA, tokenB]: [
             ],
             {
               gas: gasEstimate.toFixed(0),
-              amount: [
-                { amount: (gasEstimate * 0.025).toFixed(0), denom: 'token' },
-              ],
+              amount: [],
             }
           );
 

src/pages/Swap/hooks/useSwap.tsx

@@ -80,7 +80,7 @@ async function sendSwap(
     ],
     {
       gas: gasEstimate.toFixed(0),
-      amount: [{ amount: (gasEstimate * 0.025).toFixed(0), denom: 'token' }],
+      amount: [],
     }
   );
 }