Skip to content

Commit

Permalink
Merge pull request #11088 from hassnian/issue-10663
Browse files Browse the repository at this point in the history
fix: waiting times for mint
  • Loading branch information
vikiival authored Oct 8, 2024
2 parents 82c499b + bd37dd4 commit 791073c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
15 changes: 9 additions & 6 deletions composables/autoTeleport/useAutoTeleportTransitionDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,16 @@ export default function (
)

const needsSourceChainBalances = computed(
() => !hasEnoughInCurrentChain.value,
() => !hasEnoughInCurrentChain.value && !hasSourceChainBalances.value,
)

const actionAutoFees = computed(() =>
fees.actionAutoFees
? fees.forceActionAutoFees || needsSourceChainBalances.value
? fees.forceActionAutoFees || !hasEnoughInCurrentChain.value
: false,
)

const sourceChainsBalances = computed<{ [key: Chain]: string }>(() =>
const sourceChainsBalances = computed<Record<Chain, string>>(() =>
allowedSourceChains.value.reduce(
(reducer, chainPrefix) => ({
...reducer,
Expand All @@ -114,11 +114,14 @@ export default function (
),
)

const hasSourceChainBalances = computed(
() => Object.values(sourceChainsBalances.value).every(Boolean),
)

const hasBalances = computed(
() =>
(Boolean(currentChainBalance.value)
&& Object.values(sourceChainsBalances.value).every(Boolean))
|| hasFetched.balances,
(Boolean(currentChainBalance.value) && hasSourceChainBalances.value)
|| hasFetched.balances,
)

const richestChain = computed<Chain | undefined>(
Expand Down
10 changes: 2 additions & 8 deletions composables/useMultipleBalance.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { ApiPromise, WsProvider } from '@polkadot/api'
import { decodeAddress, encodeAddress } from '@polkadot/util-crypto'
import { storeToRefs } from 'pinia'
import {
CHAINS,
ENDPOINT_MAP,
type ChainProperties,
type Prefix,
} from '@kodadot1/static'
Expand Down Expand Up @@ -59,6 +57,7 @@ export default function (refetchPeriodically: boolean = false) {
const fiatStore = useFiatStore()
const { existentialDeposit } = useChain()
const { getEvmBalance: fetchEvmBalance } = useBalance()
const { apiInstanceByPrefix } = useApi()

const {
multiBalances,
Expand Down Expand Up @@ -113,20 +112,15 @@ export default function (refetchPeriodically: boolean = false) {
}) {
const publicKey = decodeAddress(address)
const prefixAddress = encodeAddress(publicKey, chain.ss58Format)
const wsProvider = new WsProvider(ENDPOINT_MAP[prefix])

const api = await ApiPromise.create({
provider: wsProvider,
})
const api = await apiInstanceByPrefix(prefix)

const balance = await getNativeBalance({
address: prefixAddress,
api: api,
tokenId,
})

await wsProvider.disconnect()

return { balance: balance.toString(), prefixAddress }
}

Expand Down

0 comments on commit 791073c

Please sign in to comment.