Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(beta): 74% of October 2024 Durian 💛 #11161

Merged
merged 79 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
6a35132
rmrk out of libs/static/src/chains.ts
vikiival Oct 4, 2024
a32e4c2
rmrk out of libs/static/src/endpoints.ts
vikiival Oct 4, 2024
c2acba4
rmrk out of libs/static/src/indexers.ts
vikiival Oct 4, 2024
b7cbd91
rmrk out of libs/static/src/names.ts
vikiival Oct 4, 2024
a59fd97
rmrk out of libs/static/src/services.ts
vikiival Oct 4, 2024
6957579
rmrk out of libs/static/src/types.ts
vikiival Oct 4, 2024
b4b63ff
:technologist: show data based on assethubs
vikiival Oct 4, 2024
f8791ef
app: remove rmrk prefix from composables/useBlockTime.ts
vikiival Oct 4, 2024
b53719c
app: remove rmrk prefix from composables/useTransak.ts
vikiival Oct 4, 2024
637050e
app: remove rmrk prefix from composables/useUsdValue.ts
vikiival Oct 4, 2024
e16d61b
app: remove rmrk prefix from stores/identity.ts
vikiival Oct 4, 2024
0b44818
app: remove rmrk prefix from utils/chain.ts
vikiival Oct 4, 2024
552b26d
app: remove rmrk prefix from utils/teleport.ts
vikiival Oct 4, 2024
5dde5cf
:bookmark: [email protected]
vikiival Oct 4, 2024
3f05fd9
:bookmark: [email protected]
vikiival Oct 4, 2024
07c9c62
app: remove rmrk prefix from composables/useMultipleBalance.ts
vikiival Oct 4, 2024
65f7ca6
app: remove rmrk prefix from composables/useRamp.ts
vikiival Oct 4, 2024
1c75bb2
Update chains.ts
vikiival Oct 4, 2024
aa07245
ref(listingCart.ts): move cart logic into `useCart`
hassnian Oct 8, 2024
cfa6542
add(ListingCartMini.vue): nft transfer button
hassnian Oct 9, 2024
d70fdc6
ref(useCart.ts): composable ref to computed
hassnian Oct 9, 2024
b6da60d
ref(ItemsGrid): remove `listing` code duplication
hassnian Oct 9, 2024
c317ace
add(ItemTransferModal.vue): mass nft transfer
hassnian Oct 9, 2024
dd704a9
ref(preferences.ts): rename to `itemTransferCartModalOpen`
hassnian Oct 9, 2024
3e07aa0
ref(ItemTransferModal.vue): use `ModalBody`
hassnian Oct 9, 2024
77c79e6
ref(ItemTransferModal.vue): modal to 32px tailwind
hassnian Oct 9, 2024
590183c
ref(ItemTransferModal.vue): move logic to `useTransactionActionFee` c…
hassnian Oct 9, 2024
c839879
fix(transactionExecutor.ts): `getActionTransactionFee` by provided pr…
hassnian Oct 9, 2024
78d9ee9
Merge branch 'main' into issue-11072
hassnian Oct 10, 2024
7a629ac
ref(useCart.ts): remove `ID` type
hassnian Oct 10, 2024
8971a83
add(ItemTransferModal.vue): auto teleport support
hassnian Oct 10, 2024
e9cca5b
ref(ItemsGrid): nft card hover label
hassnian Oct 10, 2024
4f6835f
ref(ItemTransferModal.vue): local items and item count
hassnian Oct 10, 2024
90140f0
add(ItemTransferModal.vue): transaction progress notification & clear…
hassnian Oct 10, 2024
288c3ec
ref(ItemTransferModal.vue): remove unused css classes
hassnian Oct 10, 2024
1b9b1af
add(ListingCartMini.vue): evm item transfer
hassnian Oct 10, 2024
2ade339
ref(makeOffer.ts): use `useCart.ts`
hassnian Oct 10, 2024
140ac7f
ref(ItemsGrid): unsued `listVisible` import
hassnian Oct 10, 2024
c269222
fix(ItemGallery): item transfer
hassnian Oct 11, 2024
ea9d603
ref(en.json): format file
hassnian Oct 11, 2024
cddd9cf
fix(ItemTransferModal.vue): computed is loading
hassnian Oct 11, 2024
757786b
ref(ItemTransferModal.vue): remove redundant check
hassnian Oct 11, 2024
d5040b5
fix(ItemTransferModal.vue): add missing coma
hassnian Oct 11, 2024
0251dce
ref(ItemTransferModal.vue): use `forceActionAutoFees`
hassnian Oct 12, 2024
6ebcac6
fix(AddressChecker.vue): suggest address format on valid generic address
hassnian Oct 12, 2024
afee1f1
fix(AddressChecker.vue): wrap learn more button
hassnian Oct 12, 2024
f1c06f9
fix(GalleryItemOffer.vue): use `doAfterCheckCurrentChainVM` when maki…
hassnian Oct 14, 2024
dd2faf0
fix(ConnectWalletModal.vue): on wallet connect not called
hassnian Oct 14, 2024
7b88d0b
ref(chain.config.ts): rename `areSameVm` to `arePrefixesOfSameVm`
hassnian Oct 14, 2024
769b3e0
Merge branch 'main' into issue-11072
vikiival Oct 15, 2024
22c4b80
fix: teleport
Jarsen136 Oct 15, 2024
ef9fe3a
add(NeoButton.vue): `cmd + enter` shortcut on confirmation modals
hassnian Oct 17, 2024
26fa297
Merge branch 'main' into issue-10213
hassnian Oct 17, 2024
5a3f43b
ref(NeoButton.vue): remove shortcut watcher if button is not visible
hassnian Oct 17, 2024
a2af7dc
Merge branch 'issue-10213' of https://github.com/hassnian/nft-gallery…
hassnian Oct 17, 2024
2160ea6
add(CollectionBanner.vue): use mata banner field
hassnian Oct 18, 2024
684fa35
Merge branch 'main' into chore/statick-without-rmrk
vikiival Oct 18, 2024
e82292a
fix(CollectionBanner.vue): metaBanner ternary
hassnian Oct 19, 2024
f8b92a7
ref(utils/shortcuts.ts): move code from `useKeyboardKeys.ts `
hassnian Oct 19, 2024
ad9f811
Merge pull request #11117 from hassnian/issue-collection-banner
vikiival Oct 19, 2024
b7d2560
Merge branch 'main' into issue-11100
hassnian Oct 21, 2024
68f3d24
Merge branch 'main' into issue-11072
hassnian Oct 21, 2024
bd83e6e
Merge pull request #11113 from hassnian/issue-10213
vikiival Oct 21, 2024
2e4b4ce
Merge branch 'main' into issue-11072
hassnian Oct 21, 2024
9808e6c
fix(ItemTransferModal.vue): missing `forceActionAutoFees`
hassnian Oct 21, 2024
cf05380
fix(ItemTransferModal.vue): wrong merge conflict
hassnian Oct 21, 2024
ca0cd43
fix(explore-collection): not loading collection deatils on page back
hassnian Oct 21, 2024
81806c1
fix: Avatar image does not fit
Jarsen136 Oct 21, 2024
5cf7489
Merge pull request #11122 from hassnian/issue-11121
vikiival Oct 21, 2024
4909576
fix: rmrk transfer
Jarsen136 Oct 21, 2024
8836d42
Merge branch 'main' into chore/statick-without-rmrk
vikiival Oct 21, 2024
32802c4
Merge pull request #11080 from kodadot/chore/statick-without-rmrk
vikiival Oct 21, 2024
d6864dd
Merge pull request #11101 from hassnian/issue-11100
vikiival Oct 21, 2024
4baed46
fix: inner class name
Jarsen136 Oct 22, 2024
af2a1cb
Merge branch 'main' into issue-11124
vikiival Oct 22, 2024
877c4c5
Merge pull request #11125 from Jarsen136/issue-11124
vikiival Oct 22, 2024
6fd77d3
Merge pull request #11096 from hassnian/issue-11072
vikiival Oct 22, 2024
9c807ad
fix(drops): unlimited does not work on ahp
hassnian Oct 23, 2024
4d70b19
Merge pull request #11160 from hassnian/issue-11159
vikiival Oct 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/base/MediaItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
:preview="preview"
:autoplay="autoplay"
:lazy-loading="lazyLoading"
:inner-class="innerClass"
/>
<div
v-if="isLewd && isLewdBlurredLayer"
Expand Down Expand Up @@ -101,6 +102,7 @@ const props = withDefaults(
lazyLoading?: boolean
enableNormalTag?: boolean
sizes?: string
innerClass?: string
imageComponent?:
| string
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
Expand Down
17 changes: 11 additions & 6 deletions components/collection/CollectionHeader/CollectionBanner.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div
class="collection-banner relative md:h-[560px] h-72 bg-no-repeat bg-cover bg-center border-b"
:style="{ backgroundImage: `url(${bannerImageUrl})` }"
:style="{ backgroundImage: `url(${collectionBanner})` }"
>
<div class="collection-banner-shadow absolute inset-0" />

Expand Down Expand Up @@ -55,38 +55,43 @@ const props = defineProps<{
const route = useRoute()

const collectionAvatar = ref('')
const collectionBanner = ref('')
const collectionName = ref('--')

const bannerImageUrl = computed(
() => collectionAvatar.value && toOriginalContentUrl(collectionAvatar.value),
)

watch(() => props.collectionId, () => {
collectionAvatar.value = ''
collectionBanner.value = ''
collectionName.value = '--'
})

watchEffect(async () => {
const collection = props.collection
const metadata = collection?.metadata
const image = collection?.meta?.image
const banner = collection?.meta?.banner || image
const name = collection?.name

if (image && name) {
if (image && name && banner) {
collectionAvatar.value = sanitizeIpfsUrl(image)
collectionBanner.value = toOriginalContentUrl(sanitizeIpfsUrl(banner))
collectionName.value = name
}
else {
const meta = (await processSingleMetadata(
metadata as string,
)) as NFTMetadata
const metaImage = sanitizeIpfsUrl(meta?.image)
const metaBanner = meta?.banner ? sanitizeIpfsUrl(meta?.banner) : metaImage
const metaName = meta?.name

if (metaName) {
collectionName.value = metaName
}

if (metaBanner) {
collectionBanner.value = toOriginalContentUrl(metaBanner)
}

if (metaImage) {
collectionAvatar.value = metaImage
}
Expand Down
2 changes: 1 addition & 1 deletion components/collection/drop/GenerativePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const { formatted: formattedPrice } = useAmount(
)

const emit = defineEmits(['generation:start', 'generation:end', 'mint'])
const isUnlimited = computed(() => drop.value.max !== undefined && drop.value.max > Number.MAX_SAFE_INTEGER)
const isUnlimited = computed(() => drop.value.max !== undefined && drop.value.max >= Number.MAX_SAFE_INTEGER)

const { start: startTimer } = useTimeoutFn(() => {
// quick fix: ensure that even if the completed event is not received, the loading state of the drop can be cleared
Expand Down
1 change: 1 addition & 0 deletions components/collection/utils/useCollectionDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export const useCollectionMinimal = ({

collection.value = collectionData
},
{ immediate: true },
)

watchEffect(async () => {
Expand Down
14 changes: 5 additions & 9 deletions components/common/ConnectWallet/ConnectEvm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import { useAccount, useDisconnect, useConnections } from '@wagmi/vue'
const emits = defineEmits(['select'])

const { address, isConnected, isConnecting, chainId } = useAccount()
const { urlPrefix, setUrlPrefix } = usePrefix()
const { modal } = useWeb3Modal()
const { disconnectAsync: disconnect } = useDisconnect()
const connections = useConnections()
Expand All @@ -47,15 +46,12 @@ watch([address, isConnected, chainId], ([address, isConnected, chainId]) => {
const chainPrefix = CHAIN_ID_TO_PREFIX?.[chainId ?? '']

if (address && isConnected && chainId && chainPrefix) {
const isCorrectChainConnected = chainPrefix === urlPrefix.value

if (!isCorrectChainConnected) {
setUrlPrefix(chainPrefix)
}

emits('select', {
address: address as string,
vm: 'EVM',
account: {
address: address as string,
vm: 'EVM',
},
prefix: chainPrefix,
})
}
})
Expand Down
12 changes: 7 additions & 5 deletions components/common/ConnectWallet/ConnectSubstrate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,13 @@ const installedWallet = computed(() => {
const setAccount = (account: SubstrateWalletAccount) => {
forceWalletSelect.value = false
emits('select', {
address: account.address,
extension: account.source,
name: account.name,
vm: 'SUB',
} as WalletAccount)
account: {
address: account.address,
extension: account.source,
name: account.name,
vm: 'SUB',
} as WalletAccount,
})
}

const refreshWallets = () => {
Expand Down
15 changes: 9 additions & 6 deletions components/common/ConnectWallet/ConnectWalletModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@

<script setup lang="ts">
import { NeoModalHead } from '@kodadot1/brick'
import { type ChainVM, DEFAULT_VM_PREFIX } from '@kodadot1/static'
import { type ChainVM, type Prefix } from '@kodadot1/static'
import { DEFAULT_VM_PREFIX } from '@kodadot1/static'
import WalletAsset from '@/components/common/ConnectWallet/WalletAsset.vue'
import { ModalCloseType } from '@/components/navbar/types'
import { arePrefixesOfSameVm } from '@/utils/config/chain.config'

const emit = defineEmits(['close', 'connect'])
const props = defineProps<{ preselected?: ChainVM }>()
Expand All @@ -68,14 +70,15 @@ const selectedTab = ref<ChainVM>(props.preselected ?? 'SUB')

const showAccount = computed(() => Boolean(account.value))

const setAccount = (account: WalletAccount) => {
const setAccount = ({ account, prefix }: { account: WalletAccount, prefix?: Prefix }) => {
prefix ??= DEFAULT_VM_PREFIX[account.vm]

walletStore.setWallet(account)
identityStore.setAuth({ address: account.address })

if (!isPrefixVmOf(urlPrefix.value, account.vm)) {
const newChain = DEFAULT_VM_PREFIX[account.vm]
setUrlPrefix(newChain)
redirectAfterChainChange(newChain)
if (!arePrefixesOfSameVm(prefix, urlPrefix.value)) {
setUrlPrefix(prefix)
redirectAfterChainChange(urlPrefix.value)
}

emit('connect', account)
Expand Down
2 changes: 0 additions & 2 deletions components/common/Notification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ import {
NeoMessage,
} from '@kodadot1/brick'

type NotificationAction = { label: string, url: string, icon?: string }

const emit = defineEmits(['close'])
const props = withDefaults(
defineProps<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
:disabled="isDisabled"
:loading="loading"
:loading-with-label="loading"
with-shortcut
class="flex flex-grow btn-height capitalize"
@click="handleSubmit"
/>
Expand Down
Loading
Loading