Add Galaxy Station wallet

.husky/_/husky.sh

@@ -1,36 +1,36 @@
-#!/usr/bin/env sh
-if [ -z "$husky_skip_init" ]; then
-  debug () {
-    if [ "$HUSKY_DEBUG" = "1" ]; then
-      echo "husky (debug) - $1"
-    fi
-  }
-
-  readonly hook_name="$(basename -- "$0")"
-  debug "starting $hook_name..."
-
-  if [ "$HUSKY" = "0" ]; then
-    debug "HUSKY env variable is set to 0, skipping hook"
-    exit 0
-  fi
-
-  if [ -f ~/.huskyrc ]; then
-    debug "sourcing ~/.huskyrc"
-    . ~/.huskyrc
-  fi
-
-  readonly husky_skip_init=1
-  export husky_skip_init
-  sh -e "$0" "$@"
-  exitCode="$?"
-
-  if [ $exitCode != 0 ]; then
-    echo "husky - $hook_name hook exited with code $exitCode (error)"
-  fi
-
-  if [ $exitCode = 127 ]; then
-    echo "husky - command not found in PATH=$PATH"
-  fi
-
-  exit $exitCode
-fi
+#!/usr/bin/env sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    if [ "$HUSKY_DEBUG" = "1" ]; then
+      echo "husky (debug) - $1"
+    fi
+  }
+
+  readonly hook_name="$(basename -- "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  readonly husky_skip_init=1
+  export husky_skip_init
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+  fi
+
+  if [ $exitCode = 127 ]; then
+    echo "husky - command not found in PATH=$PATH"
+  fi
+
+  exit $exitCode
+fi

components/Pages/Bonding/hooks/getBondingConfig.ts

@@ -19,7 +19,7 @@ export interface BondingContractConfig {
 
 export const getBondingConfig = async (client: CosmWasmClient | null,
   config: Config) => {
-  if (!client && !config) {
+  if (!client || !config?.whale_lair) {
     return null
   }
   const bondingConfig = await fetchConfig(client, config)
@@ -29,7 +29,10 @@ export const getBondingConfig = async (client: CosmWasmClient | null,
 export const fetchConfig = async (client: CosmWasmClient,
   config: Config): Promise<BondingContractConfig> => {
   // TODO: API
-  const result: JsonObject = await client.queryContractSmart(config.whale_lair,
+  if (!client || !config?.whale_lair) {
+    return null
+  }
+  const result: JsonObject = await client.queryContractSmart(config?.whale_lair,
     {
       config: {},
     })

components/Pages/Bonding/hooks/getCurrentEpoch.ts

@@ -37,7 +37,10 @@ export interface Epoch {
 
 export const fetchCurrentEpoch = async (client: CosmWasmClient,
   config: Config): Promise<Epoch> => {
-  const result: JsonObject = await client?.queryContractSmart(config.fee_distributor,
+    if (!client || !config?.fee_distributor) {
+      return null
+    }
+  const result: JsonObject = await client?.queryContractSmart(config?.fee_distributor,
     {
       current_epoch: {},
     })
@@ -47,10 +50,9 @@ export const fetchCurrentEpoch = async (client: CosmWasmClient,
 
 export const getCurrentEpoch = async (client: CosmWasmClient,
   config: Config) => {
-  if (!client) {
+  if (!client || !config?.fee_distributor) {
     return null
   }
-
   const currentEpoch = await fetchCurrentEpoch(client, config)
 
   return { currentEpoch }

components/Pages/Bonding/hooks/getFeeDistributorConfig.ts

@@ -22,7 +22,7 @@ const fetchConfig = async (client: CosmWasmClient,
   config: Config): Promise<FeeDistributionConfig> => {
   // TODO: API
 
-  const result: JsonObject = await client.queryContractSmart(config.fee_distributor,
+  const result: JsonObject = await client.queryContractSmart(config?.fee_distributor,
     {
       config: {},
     })
@@ -31,7 +31,7 @@ const fetchConfig = async (client: CosmWasmClient,
 }
 export const getFeeDistributorConfig = async (client: CosmWasmClient,
   config: Config) => {
-  if (!client) {
+  if (!client || !config?.fee_distributor) {
     return null
   }
   const feeDistributionConfig = await fetchConfig(client, config)

components/Pages/Dashboard/Dashboard.tsx

@@ -28,8 +28,10 @@ export const Dashboard: FC = () => {
       const circulatingWhaleSupply = dashboardData.supply?.circulating / (10 ** 6) || 0
       const marketCap = circulatingWhaleSupply * (prices?.WHALE || 0) || 0
       const mappedDashboardData = dashboardData.dashboardData?.map((data) => {
-        const apr = dashboardData.bondingInfos[data.chainName]?.bondingAPR
-        const buyback = dashboardData.bondingInfos[data.chainName]?.buyback
+
+        const apr = (dashboardData?.bondingInfos?.[data.chainName]?.bondingAPR) || 0;
+        const buyback = (dashboardData?.bondingInfos?.[data.chainName]?.buyback) || 0;
+
         return ({
           logoUrl: getChainLogoUrlByName(data.chainName),
           chainName: data.chainName,

components/Pages/Trade/Incentivize/hooks/useEpoch.ts

@@ -86,20 +86,23 @@ const useEpoch = () => {
   const { cosmWasmClient } = useClients(walletChainName)
   const { data: config } = useQuery<EpochConfigData>({
     queryKey: ['incentive', 'config', contracts?.fee_distributor],
-    queryFn: async () =>
-      // TODO: API
-      await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
+    queryFn: async () => {
+      if (!contracts?.fee_distributor) {
+        return null
+      }
+      return await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
         config: {},
-      }),
-    enabled: Boolean(contracts) && Boolean(cosmWasmClient),
+      })
+    },
+    enabled: Boolean(contracts?.fee_distributor) && Boolean(cosmWasmClient),
   })
 
   const { data } = useQuery<EpochData>({
     queryKey: ['incentive', 'epoch', contracts?.fee_distributor],
     queryFn: async () => await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
       current_epoch: {},
     }),
-    enabled: Boolean(contracts) && Boolean(cosmWasmClient),
+    enabled: Boolean(contracts?.fee_distributor) && Boolean(cosmWasmClient),
   })
   const dateToEpoch = (givenDate) => {
     if (!data?.epoch?.id || !config?.epoch_config?.duration || !givenDate) {

components/Wallet/ConnectedWalletWithDisconnect/ConnectedWallet/ConnectedWalletIcon.tsx

@@ -2,6 +2,7 @@ import React from 'react'
 
 import { useChain } from '@cosmos-kit/react-lite'
 import CosmostationWalletIcon from 'components/Icons/CosmostationWalletIcon'
+import GalaxyStationExtensionIcon from 'components/Icons/GalaxyStationExtensionIcon';
 import KeplrWalletIcon from 'components/Icons/KeplrWalletIcon'
 import LeapSnapIcon from 'components/Icons/LeapSnapIcon'
 import LeapWalletIcon from 'components/Icons/LeapWalletIcon'
@@ -30,6 +31,8 @@ export const ConnectedWalletIcon = () => {
       return <NinjiWalletIcon />
     case WalletType.okxwallet:
       return <OKXWalletIcon />
+    case WalletType.galaxyStationExtension:
+      return <GalaxyStationExtensionIcon />
     default:
       return <></>
   }

components/Wallet/Modal/WalletConnectButton.tsx

@@ -2,6 +2,7 @@ import { useCallback } from 'react'
 
 import { Button, HStack, Text, useToast } from '@chakra-ui/react'
 import CosmostationWalletIcon from 'components/Icons/CosmostationWalletIcon'
+import GalaxyStationExtensionIcon from 'components/Icons/GalaxyStationExtensionIcon';
 import KeplrWalletIcon from 'components/Icons/KeplrWalletIcon'
 import LeapSnapIcon from 'components/Icons/LeapSnapIcon'
 import LeapWalletIcon from 'components/Icons/LeapWalletIcon'
@@ -54,8 +55,8 @@ export const WalletConnectButton = ({ onCloseModal, connect, walletType }: Props
         }
       }
     }
-    if ((walletType === WalletType.terraExtension || walletType === WalletType.keplrExtension)) {
-      const windowConnection = walletType === WalletType.terraExtension ? (window.station?.keplr) : (window?.keplr)
+    if ((walletType === WalletType.terraExtension || walletType === WalletType.galaxyStationExtension || walletType === WalletType.keplrExtension)) {
+      const windowConnection = walletType === WalletType.terraExtension ? (window.station?.keplr) : walletType === WalletType.galaxyStationExtension ? (window.galaxyStation?.keplr) : (window?.keplr)
       try {
         await (windowConnection.getKey(chainId))
       } catch (e) {
@@ -94,6 +95,8 @@ export const WalletConnectButton = ({ onCloseModal, connect, walletType }: Props
         return 'Ninji Wallet'
       case WalletType.okxwallet:
         return 'OKX Wallet'
+      case WalletType.galaxyStationExtension:
+        return 'Galaxy Station'
       default:
         return null
     }
@@ -123,6 +126,8 @@ export const WalletConnectButton = ({ onCloseModal, connect, walletType }: Props
         return <NinjiWalletIcon />
       case WalletType.okxwallet:
         return <OKXWalletIcon />
+      case WalletType.galaxyStationExtension:
+        return <GalaxyStationExtensionIcon />
       default:
         return null
     }

components/Wallet/Modal/WalletModal.tsx

@@ -27,6 +27,7 @@ export enum WalletType {
   cosmoStationMobile = 'cosmostation-mobile',
   ninjiExtension = 'ninji-extension',
   okxwallet = 'okxwallet-extension',
+  galaxyStationExtension = 'galaxy-station-extension',
 }
 
 export const WalletModal = ({ isOpen, setOpen, walletRepo }) => {
@@ -50,6 +51,7 @@ export const WalletModal = ({ isOpen, setOpen, walletRepo }) => {
       WalletType.leapExtension,
       WalletType.ninjiExtension,
       WalletType.okxwallet,
+      WalletType.galaxyStationExtension,
     ].includes(walletName);
     if (walletName === WalletType.okxwallet && !okxchains.includes(chainId)) {
       return false

components/Wallet/Wallet.tsx

@@ -92,8 +92,8 @@ const Wallet = () => {
 
       setWalletChains(snapChainIds)
       setCurrentConnectedChainIds(snapChainIds)
-    } else if (walletType === WalletType.terraExtension || walletType === WalletType.keplrExtension) {
-      const walletWindowConnection = walletType === WalletType.terraExtension ? (window.station?.keplr) : (window?.keplr)
+    } else if (walletType === WalletType.terraExtension || walletType === WalletType.keplrExtension || walletType === WalletType.galaxyStationExtension) {
+      const walletWindowConnection = walletType === WalletType.terraExtension ? (window.station?.keplr) : walletType === WalletType.galaxyStationExtension ? (window.galaxyStation?.keplr) : (window?.keplr)
       const getAddedStationChainsIds = async () => {
         const chainInfos = await walletWindowConnection?.getChainInfosWithoutEndpoints()
         if (!chainInfos) {

constants/endpoints.json

@@ -36,7 +36,7 @@
             "https://rpc.comdex.one"
         ],
         "rest": [
-            "https://ww-comdex-rest.polkachu.com"
+            "https://rest.comdex.one"
         ]
     },
     "injective": {

package.json

@@ -31,6 +31,7 @@
     "@cosmos-kit/react-lite": "^2.6.9",
     "@cosmos-kit/shell": "^2.6.9",
     "@cosmos-kit/station": "^2.5.9",
+    "@cosmos-kit/galaxy-station": "^2.6.2",
     "@emotion/react": "^11",
     "@emotion/styled": "^11",
     "@injectivelabs/sdk-ts": "^1.14.6",

pages/_app.tsx

@@ -4,6 +4,7 @@ import { QueryClientProvider } from 'react-query'
 
 import { CSSReset, ChakraProvider } from '@chakra-ui/react'
 import { wallets as cosmoStationWallets } from '@cosmos-kit/cosmostation'
+import { wallets as galaxyStationWallets } from '@cosmos-kit/galaxy-station'
 import { wallets as keplrWallets } from '@cosmos-kit/keplr'
 import { wallets as leapWallets } from '@cosmos-kit/leap'
 import { wallets as ninjiWallets } from '@cosmos-kit/ninji'
@@ -63,6 +64,10 @@ const MyApp: FC<AppProps> = ({
       name: 'okxwallet',
       wallet: okxwallet,
     },
+    {
+      name: 'galaxystation',
+      wallet: galaxyStationWallets,
+    },
   ];
 
   const reorderWallets = useMemo(() => {

public/mainnet/comdex-1/config.json

@@ -0,0 +1,3 @@
+{
+}
+