diff --git a/components/Banner/index.tsx b/components/Banner/index.tsx
index 2f462837..30b050c9 100644
--- a/components/Banner/index.tsx
+++ b/components/Banner/index.tsx
@@ -33,7 +33,7 @@ const Banner: React.FC = () => {
         }}
       >
         {banners.map((banner) => (
-          <Link href="/dsm-airdrop">
+          <Link href="/dsm-airdrop" key={banner}>
             <CardMedia className={classes.bannerImage} image={banner} component="img" />
           </Link>
         ))}
diff --git a/components/ConfirmTransactionDialog/index.tsx b/components/ConfirmTransactionDialog/index.tsx
index 007a2245..56b8d8ef 100644
--- a/components/ConfirmTransactionDialog/index.tsx
+++ b/components/ConfirmTransactionDialog/index.tsx
@@ -95,9 +95,7 @@ const ConfirmTransactionDialog: React.FC<ConfirmTransactionDialogProps> = ({
 
   React.useEffect(() => {
     if (defaultTransactionData && account) {
-      estimateGasFee(defaultTransactionData, account).then((f) =>
-        setFee(granter ? { ...f, granter } : f)
-      )
+      estimateGasFee(defaultTransactionData, account, granter).then(setFee)
     }
   }, [defaultTransactionData, account, granter])
 
diff --git a/components/ConnectLedgerDialogContent/index.tsx b/components/ConnectLedgerDialogContent/index.tsx
index 6c81c163..771a7b77 100644
--- a/components/ConnectLedgerDialogContent/index.tsx
+++ b/components/ConnectLedgerDialogContent/index.tsx
@@ -12,6 +12,7 @@ import React from 'react'
 import Carousel from 'react-material-ui-carousel'
 import TransportWebHID from '@ledgerhq/hw-transport-webhid'
 import { LaunchpadLedger } from '@cosmjs/ledger-amino'
+import TerraApp from '@terra-money/ledger-terra-js'
 import LedgerImage from '../../assets/images/ledger.svg'
 import LedgerSignImage from '../../assets/images/sign_ledger.svg'
 import LedgerSignPinImage from '../../assets/images/sign_ledger_with_PIN.svg'
@@ -65,9 +66,18 @@ const ConnectLedgerDialogContent: React.FC<ConnectLedgerDialogContentProps> = ({
     let transport
     try {
       transport = await TransportWebHID.create()
-      const ledger = new LaunchpadLedger(transport, { ledgerAppName })
-      // Check if ledger app is open
-      await ledger.getCosmosAppVersion()
+      if (ledgerAppName === 'terra') {
+        const ledger = new TerraApp(transport)
+        // Check if ledger app is open
+        const response = await ledger.getAddressAndPubKey([44, 330, 0, 0, 0], 'terra')
+        if (!response || !response.bech32_address) {
+          throw new Error(response.error_message)
+        }
+      } else {
+        const ledger = new LaunchpadLedger(transport, { ledgerAppName })
+        // Check if ledger app is open
+        await ledger.getCosmosAppVersion()
+      }
       setInstruction(signInstructions[1])
       clearTimeout(retryTimeout)
       onConnect(transport)
diff --git a/components/DsmAirdrop/CheckAirdrop.tsx b/components/DsmAirdrop/CheckAirdrop.tsx
index 892076bf..35cd7243 100644
--- a/components/DsmAirdrop/CheckAirdrop.tsx
+++ b/components/DsmAirdrop/CheckAirdrop.tsx
@@ -130,6 +130,8 @@ const CheckAirdrop: React.FC<CheckAirdropProps> = ({
               <Box>
                 {dataStakingInfo.map((item, key) => {
                   const chain = item.chain_name
+                  const dsm = item.dsm_allotted
+                  const { claimed } = item
                   return (
                     <Box
                       display="flex"
@@ -138,14 +140,41 @@ const CheckAirdrop: React.FC<CheckAirdropProps> = ({
                       pt={theme.spacing(0.2)}
                       key={key}
                     >
-                      <Box pr={theme.spacing(0.2)}>
+                      <Box pr={theme.spacing(0.2)} display="flex" alignItems="center">
                         <TickIcon />
                       </Box>
-                      <Typography style={{ color: theme.palette.primary.main, padding: 0 }}>
+                      <Typography
+                        style={{
+                          color: theme.palette.primary.main,
+                          padding: 0,
+                          display: 'flex',
+                          flexDirection: 'row',
+                        }}
+                      >
                         {t('chain staker', {
                           chain,
                           suffix: item.forbole_delegator ? '& Forbole Delegator' : '',
                         })}
+                        {/* {dsm DSM} */}
+                        {claimed ? (
+                          <Typography
+                            style={{
+                              color: theme.palette.text.secondary,
+                              paddingLeft: theme.spacing(1),
+                            }}
+                          >
+                            {formatCrypto(dsm, 'DSM', lang)} {t('claimed')}
+                          </Typography>
+                        ) : (
+                          <Typography
+                            style={{
+                              color: theme.palette.text.primary,
+                              paddingLeft: theme.spacing(1),
+                            }}
+                          >
+                            {formatCrypto(dsm, 'DSM', lang)}
+                          </Typography>
+                        )}
                       </Typography>
                     </Box>
                   )
@@ -156,6 +185,8 @@ const CheckAirdrop: React.FC<CheckAirdropProps> = ({
               <Box pb={theme.spacing(0.2)}>
                 {lpInfos.map((item, key) => {
                   const chain = item.chain_name
+                  const dsm = item.dsm_allotted
+                  const { claimed } = item
                   return (
                     <Box
                       display="flex"
@@ -164,11 +195,37 @@ const CheckAirdrop: React.FC<CheckAirdropProps> = ({
                       pt={theme.spacing(0.2)}
                       key={key}
                     >
-                      <Box pr={theme.spacing(0.2)}>
+                      <Box pr={theme.spacing(0.2)} display="flex" alignItems="center">
                         <TickIcon />
                       </Box>
-                      <Typography style={{ color: theme.palette.primary.main, padding: 0 }}>
+                      <Typography
+                        style={{
+                          color: theme.palette.primary.main,
+                          padding: 0,
+                          display: 'flex',
+                          flexDirection: 'row',
+                        }}
+                      >
                         {chain} {t('lp staker')}
+                        {claimed ? (
+                          <Typography
+                            style={{
+                              color: theme.palette.text.secondary,
+                              paddingLeft: theme.spacing(1),
+                            }}
+                          >
+                            {formatCrypto(dsm, 'DSM', lang)} {t('claimed')}
+                          </Typography>
+                        ) : (
+                          <Typography
+                            style={{
+                              color: theme.palette.text.primary,
+                              paddingLeft: theme.spacing(1),
+                            }}
+                          >
+                            {formatCrypto(dsm, 'DSM', lang)}
+                          </Typography>
+                        )}{' '}
                       </Typography>
                     </Box>
                   )
@@ -178,7 +235,14 @@ const CheckAirdrop: React.FC<CheckAirdropProps> = ({
             {(dataStakingInfo !== null && dataStakingInfo !== undefined) ||
             (lpInfos !== null && lpInfos !== undefined) ? (
               <form noValidate>
-                <Box mt={4} padding={0} width="20%">
+                <Typography
+                  style={{
+                    color: theme.palette.text.secondary,
+                  }}
+                >
+                  {t('check airdrop slogan')}
+                </Typography>
+                <Box mt={4} padding={0} minWidth="20%">
                   <Button
                     id="button"
                     variant="contained"
diff --git a/components/DsmAirdrop/ClaimableAmount.tsx b/components/DsmAirdrop/ClaimableAmount.tsx
index 68ad5b5e..31967893 100644
--- a/components/DsmAirdrop/ClaimableAmount.tsx
+++ b/components/DsmAirdrop/ClaimableAmount.tsx
@@ -11,25 +11,27 @@ interface ClaimableAmountProps {
   onConfirm(): void
   amount: number
   chainConnections: ChainConnection[]
+  loading: boolean
 }
 
 const ClaimableAmount: React.FC<ClaimableAmountProps> = ({
   onConfirm,
   amount,
   chainConnections,
+  loading,
 }) => {
   const classes = useStyles()
   const { t, lang } = useTranslation('common')
   const { currency } = useGeneralContext()
   const theme = useTheme()
 
-  const [loading, setLoading] = React.useState(false)
+  const [onClaimLoading, setOnClaimLoading] = React.useState(false)
 
   return (
     <form
       onSubmit={async (event) => {
         event.preventDefault()
-        setLoading(true)
+        setOnClaimLoading(true)
         await onConfirm()
       }}
     >
@@ -37,7 +39,7 @@ const ClaimableAmount: React.FC<ClaimableAmountProps> = ({
         <Box className={classes.stageContent}>
           <Typography align="center">{t('amount claimable title')}</Typography>
           <Typography align="center" variant="h1" className={classes.claimableAmount}>
-            {formatCrypto(amount, 'DSM', lang)}
+            {loading ? <CircularProgress /> : formatCrypto(amount, 'DSM', lang)}
           </Typography>
           <Button
             fullWidth
@@ -45,9 +47,9 @@ const ClaimableAmount: React.FC<ClaimableAmountProps> = ({
             className={classes.button}
             variant="contained"
             type="submit"
-            disabled={loading || amount <= 0}
+            // disabled={amount <= 0}
           >
-            {loading ? <CircularProgress size={theme.spacing(3)} /> : t('claim now')}
+            {onClaimLoading ? <CircularProgress size={theme.spacing(3)} /> : t('claim now')}
           </Button>
           <Link href="/">
             <Button fullWidth className={classes.secondaryButton} variant="outlined">
diff --git a/components/DsmAirdrop/index.tsx b/components/DsmAirdrop/index.tsx
index be7d4010..305a43a7 100644
--- a/components/DsmAirdrop/index.tsx
+++ b/components/DsmAirdrop/index.tsx
@@ -3,6 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react'
 import useTranslation from 'next-translate/useTranslation'
 import { useSubscription, gql } from '@apollo/client'
 import axios from 'axios'
+import get from 'lodash/get'
 import useStateHistory from '../../misc/useStateHistory'
 import { useStyles } from './styles'
 import CheckClaimable from './CheckClaimable'
@@ -16,6 +17,7 @@ import ConnectChains from './ConnectChain'
 import ClaimableAmount from './ClaimableAmount'
 import AirdropResult from './AirdropResult'
 import CheckAirdrop from './CheckAirdrop'
+import connectableChains from '../../misc/connectableChains'
 
 interface Content {
   title?: string
@@ -70,6 +72,7 @@ const DsmAirdrop: React.FC = () => {
   )
 
   const [totalDsmAllocated, setTotalDsmAllocated] = useState(0)
+  const [totalDsmAllocatedLoading, setTotalDsmAllocatedLoading] = useState(false)
   const [airdropResponse, setAirdropResponse] = useState('')
 
   const [claimSuccess, setClaimSuccess] = useState(false)
@@ -93,6 +96,7 @@ const DsmAirdrop: React.FC = () => {
 
   useEffect(() => {
     if (chainConnections.length > 0) {
+      setTotalDsmAllocatedLoading(true)
       const axiosRequests = chainConnections.map((connection) =>
         axios.get(
           `${process.env.NEXT_PUBLIC_DSM_AIRDROP_API_URL}/users/${connection.externalAddress}`
@@ -102,19 +106,29 @@ const DsmAirdrop: React.FC = () => {
         .all(axiosRequests)
         .then(
           axios.spread((...responses) => {
-            responses.forEach((res) => {
+            responses.forEach((res, i) => {
               const chainClaimableAmount = [
                 ...(res.data.staking_infos ?? []),
                 ...(res.data.lp_infos ?? []),
               ]
-                .filter((chain) => !chain.claimed)
+                .filter(
+                  (chain) =>
+                    !chain.claimed &&
+                    chainConnections[i].externalAddress.match(
+                      new RegExp(
+                        `^${get(connectableChains, `${chain.chain_name.toLowerCase()}.prefix`)}`
+                      )
+                    )
+                )
                 .reduce((a, b) => a + b.dsm_allotted, 0)
-              return setTotalDsmAllocated(totalDsmAllocated + chainClaimableAmount)
+              return setTotalDsmAllocated((total) => total + chainClaimableAmount)
             })
+            setTotalDsmAllocatedLoading(false)
           })
         )
         .catch((error) => {
           console.log(error)
+          // setTotalDsmAllocatedLoading(false)
         })
     }
   }, [chainConnections])
@@ -151,6 +165,7 @@ const DsmAirdrop: React.FC = () => {
               }}
               amount={totalDsmAllocated}
               chainConnections={chainConnections}
+              loading={totalDsmAllocatedLoading}
             />
           ),
         }
diff --git a/locales/en/common.json b/locales/en/common.json
index fdb6a9c1..cd119e17 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -478,5 +478,7 @@
   "airdrop connect account subtitle": "Now it’s time to connect your Desmos Profile to your first wallet account and claim your airdrop for such an account",
   "chain staker": "{{chain}} Staker {{suffix}}",
   "claim later": "Claim Later",
-  "claim disabled": "Claim Disabled"
+  "claim disabled": "Claim Disabled",
+  "claimed": "claimed",
+  "check airdrop slogan": "*The more accounts you connected, the more DSM you could claim"
 }
diff --git a/misc/connectableChains.ts b/misc/connectableChains.ts
index 2ba49466..ace530cc 100644
--- a/misc/connectableChains.ts
+++ b/misc/connectableChains.ts
@@ -34,12 +34,12 @@ const connectableChains = {
     coinType: 118,
     ledgerAppNames: ['cosmos'],
   },
-  cro: {
+  'crypto.org chain': {
     name: 'Crypto.org',
     image: '/static/images/cryptocurrencies/cro.png',
     prefix: 'cro',
-    coinType: 118,
-    ledgerAppNames: ['cosmos'],
+    coinType: 394,
+    ledgerAppNames: ['crypto.org chain', 'cosmos'],
   },
   terra: {
     name: 'Terra',
diff --git a/misc/tx/estimateGasFee.ts b/misc/tx/estimateGasFee.ts
index 7001fd43..06269cb7 100644
--- a/misc/tx/estimateGasFee.ts
+++ b/misc/tx/estimateGasFee.ts
@@ -6,7 +6,7 @@ import get from 'lodash/get'
 import { StargateClient } from '@cosmjs/stargate'
 import cryptocurrencies from '../cryptocurrencies'
 
-export const transformMsg = (obj: any): any =>
+const transformMsg = (obj: any): any =>
   transform(obj, (acc, value, key, target) => {
     const camelKey = isArray(target) ? key : snakeCase(String(key))
     const childKeys = Object.keys(value)
@@ -20,9 +20,37 @@ export const transformMsg = (obj: any): any =>
     }
   })
 
+const transformFee = async (
+  signer: string,
+  crypto: Cryptocurrency,
+  gas: number,
+  granter?: string
+) => {
+  const fee: any = {
+    amount: [
+      { amount: String(Math.round(gas * crypto.gasFee.amount)), denom: crypto.gasFee.denom },
+    ],
+    gas: String(gas),
+  }
+  if (granter) {
+    try {
+      const { balances } = await fetch(
+        `${crypto.lcdApiUrl}/cosmos/bank/v1beta1/balances/${signer}`
+      ).then((r) => r.json())
+      if (!balances.length) {
+        fee.granter = granter
+      }
+    } catch (err) {
+      console.log(err)
+    }
+  }
+  return fee
+}
+
 const estimateGasFee = async (
   tx: Transaction,
-  account: Account
+  account: Account,
+  granter?: string
 ): Promise<{
   amount: Array<{ amount: string; denom: string }>
   gas: string
@@ -75,20 +103,12 @@ const estimateGasFee = async (
     const gas =
       Math.round(Number(get(result, 'gas_info.gas_used', '0')) * crypto.gasAdjustment) ||
       tx.msgs.map((msg) => crypto.defaultGas[msg.typeUrl]).reduce((a, b) => a + b, 0)
-    return {
-      amount: [
-        { amount: String(Math.round(gas * crypto.gasFee.amount)), denom: crypto.gasFee.denom },
-      ],
-      gas: String(gas),
-    }
+    const fee = await transformFee(account.address, crypto, gas, granter)
+    return fee
   } catch (err) {
     const gas = tx.msgs.map((msg) => crypto.defaultGas[msg.typeUrl]).reduce((a, b) => a + b, 0)
-    return {
-      amount: [
-        { amount: String(Math.round(gas * crypto.gasFee.amount)), denom: crypto.gasFee.denom },
-      ],
-      gas: String(gas),
-    }
+    const fee = await transformFee(account.address, crypto, gas, granter)
+    return fee
   }
 }
 
diff --git a/misc/tx/generateProof.ts b/misc/tx/generateProof.ts
index b16b6735..67df699f 100644
--- a/misc/tx/generateProof.ts
+++ b/misc/tx/generateProof.ts
@@ -1,9 +1,10 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { Secp256k1HdWallet } from '@cosmjs/amino'
+import { Secp256k1HdWallet, serializeSignDoc } from '@cosmjs/amino'
 import { stringToPath } from '@cosmjs/crypto'
 import { LedgerSigner } from '@cosmjs/ledger-amino'
 import { toBase64 } from '@cosmjs/encoding'
-import cryptocurrencies from '../cryptocurrencies'
+import TerraApp from '@terra-money/ledger-terra-js'
+import { signatureImport } from 'secp256k1'
 import { WalletOption } from './getWalletAddress'
 
 const generateProof = async (
@@ -12,6 +13,29 @@ const generateProof = async (
   option: WalletOption,
   ledgerTransport?: any
 ): Promise<ChainLinkProof> => {
+  const proof = {
+    account_number: '0',
+    chain_id: '',
+    fee: { amount: [], gas: '200000' },
+    memo: signerAddress,
+    msgs: [],
+    sequence: '0',
+  }
+
+  if (option.ledgerAppName === 'terra' && ledgerTransport) {
+    const app = new TerraApp(ledgerTransport)
+    const hdPath = [44, option.coinType, option.account || 0, option.change || 0, option.index || 0]
+    const result = await app.getAddressAndPubKey(hdPath, option.prefix)
+    const { signature } = await app.sign(hdPath, serializeSignDoc(proof))
+    return {
+      plainText: Buffer.from(JSON.stringify(proof, null, 0)).toString('hex'),
+      pubKey: {
+        typeUrl: '/cosmos.crypto.secp256k1.PubKey',
+        value: toBase64(Buffer.from(result.compressed_pk.data)),
+      },
+      signature: Buffer.from(signatureImport(Buffer.from(signature as any))).toString('hex'),
+    }
+  }
   const signerOptions = {
     hdPaths: [
       stringToPath(
@@ -33,15 +57,6 @@ const generateProof = async (
   }
   const [ac] = await signer.getAccounts()
 
-  const proof = {
-    account_number: '0',
-    chain_id: '',
-    fee: { amount: [], gas: '200000' },
-    memo: signerAddress,
-    msgs: [],
-    sequence: '0',
-  }
-
   const { signature } = await signer.signAmino(ac.address, proof)
 
   return {
diff --git a/misc/tx/getWalletAddress.ts b/misc/tx/getWalletAddress.ts
index 9b63bbc9..2e5c96ef 100644
--- a/misc/tx/getWalletAddress.ts
+++ b/misc/tx/getWalletAddress.ts
@@ -1,6 +1,7 @@
 import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing'
 import { stringToPath } from '@cosmjs/crypto'
 import { LedgerSigner } from '@cosmjs/ledger-amino'
+import TerraApp from '@terra-money/ledger-terra-js'
 
 export interface WalletOption {
   coinType: number
@@ -22,6 +23,15 @@ const getWalletAddress = async (
   //   const address = getPubkeyFromConfig(new SignerConfig('', mnemonic, ''))
   //   return address
   // }
+  if (option.ledgerAppName === 'terra' && ledgerTransport) {
+    const app = new TerraApp(ledgerTransport)
+    const hdPath = [44, option.coinType, option.account || 0, option.change || 0, option.index || 0]
+    const result = await app.getAddressAndPubKey(hdPath, option.prefix)
+    if (showAddressOnLedger) {
+      await app.showAddressAndPubKey(hdPath, option.prefix)
+    }
+    return result.bech32_address
+  }
   let signer
   const signerOptions = {
     hdPaths: [
diff --git a/package.json b/package.json
index e67b9e8e..fe186c7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "forbole-x",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -23,6 +23,7 @@
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@socialgouv/matomo-next": "^1.2.2",
+    "@terra-money/ledger-terra-js": "^1.1.0",
     "axios": "^0.24.0",
     "check-password-strength": "^1.0.15",
     "date-fns": "^2.16.1",
diff --git a/yarn.lock b/yarn.lock
index d6314103..e94dcba5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1482,7 +1482,7 @@
     "@ledgerhq/hw-transport" "^6.11.0"
     "@ledgerhq/logs" "^6.10.0"
 
-"@ledgerhq/hw-transport@^5.25.0":
+"@ledgerhq/hw-transport@^5", "@ledgerhq/hw-transport@^5.25.0":
   version "5.51.1"
   resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz#8dd14a8e58cbee4df0c29eaeef983a79f5f22578"
   integrity sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==
@@ -1859,6 +1859,15 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@terra-money/ledger-terra-js@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@terra-money/ledger-terra-js/-/ledger-terra-js-1.1.0.tgz#fc148e1090174e024d2cfd433d28bf3f07aff628"
+  integrity sha512-ty4ssb/WE4p7obewqnI/3fLa92w1mXyEq4R2Htki0LOtBv3VMXLzWEs5lT/sGlu2KbXDMMOst3kDzETL/IlRhw==
+  dependencies:
+    "@ledgerhq/hw-transport" "^5"
+    bech32 "^1.1.3"
+    ripemd160 "^2.0.2"
+
 "@testing-library/dom@^7.29.0":
   version "7.31.2"
   resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a"
@@ -2782,7 +2791,7 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bech32@^1.1.4:
+bech32@^1.1.3, bech32@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==