diff --git a/.github/renovate.json b/.github/renovate.json index 01f497d3a6..aaf39b9676 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -4,37 +4,55 @@ "automerge": true, "automergeType": "pr-comment", "automergeComment": "lgtm", - "extends": ["config:base", ":dependencyDashboard"], + "extends": [ + "config:recommended", + ":dependencyDashboard" + ], "prHourlyLimit": 5, - "enabledManagers": ["npm"], + "enabledManagers": [ + "npm" + ], "rangeStrategy": "bump", "updatePinnedDependencies": false, - "schedule": ["before 3am on Monday"], + "schedule": [ + "before 3am on Monday" + ], "packageRules": [ { - "matchSourceUrlPrefixes": [ - "https://github.com/polkadot-js/", - "https://github.com/vue-polkadot/", - "https://github.com/kodadot/packages", - "https://github.com/cloudacy/vue-markdown-render", - "https://github.com/FortAwesome/Font-Awesome", - "https://github.com/TypeStrong/ts-loader" - ], "groupName": "merge with hazmat suit extra", - "enabled": false + "enabled": false, + "matchSourceUrls": [ + "https://github.com/polkadot-js/{/,}**", + "https://github.com/vue-polkadot/{/,}**", + "https://github.com/kodadot/packages{/,}**", + "https://github.com/cloudacy/vue-markdown-render{/,}**", + "https://github.com/FortAwesome/Font-Awesome{/,}**", + "https://github.com/TypeStrong/ts-loader{/,}**" + ] }, { "groupName": "Bumped minor version of packages", "prHeader": "Bumped minor version of packages, check if builds are still passing, please 🥺", - "matchUpdateTypes": ["minor", "patch"], - "matchDepTypes": ["dependencies", "devDependencies"] + "matchUpdateTypes": [ + "minor", + "patch" + ], + "matchDepTypes": [ + "dependencies", + "devDependencies" + ] }, { - "matchUpdateTypes": ["major", "pin"], + "matchUpdateTypes": [ + "major", + "pin" + ], "enabled": false }, { - "packageNames": ["node"], + "matchPackageNames": [ + "node" + ], "enabled": false } ] diff --git a/components/base/BaseCollectionForm.vue b/components/base/BaseCollectionForm.vue deleted file mode 100644 index d94dd1ae3a..0000000000 --- a/components/base/BaseCollectionForm.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - diff --git a/components/collection/CollectionDetail.vue b/components/collection/CollectionDetail.vue index f899f2e6d3..bcc4d4e32b 100644 --- a/components/collection/CollectionDetail.vue +++ b/components/collection/CollectionDetail.vue @@ -43,7 +43,7 @@ v-if="nfts && !isLoading" class="flex justify-around is-vcentered" > -
+

{{ $t('collectionCard.volume') }}

@@ -52,7 +52,7 @@ :value="collectionTradedVolumeNumber" />
-
+

{{ $t('series.highestSale') }}

@@ -62,7 +62,7 @@ />
-
+

{{ $t('collectionCard.items') }}

@@ -76,7 +76,7 @@
-
-
+
+
{ const currentDate = new Date() const daysUntilThursday = (11 - currentDate.getDay()) % 7 - const millisecondsUntilThursday = daysUntilThursday * 24 * 60 * 60 * 1000 + const millisecondsUntilThursday = daysUntilThursday * ONE_DAY_MS currentDate.setUTCHours(14, 0, 0, 0) // Set time to 3 PM CET const dropDate = new Date(currentDate.getTime() + millisecondsUntilThursday) dropDate.setHours(currentDate.getHours()) diff --git a/components/drops/utils.ts b/components/drops/utils.ts index 6f533abe8f..1bbabcce55 100644 --- a/components/drops/utils.ts +++ b/components/drops/utils.ts @@ -62,7 +62,6 @@ export const parseCETDate = (datetime: string): Date => { export const dateHasTime = (datetime: string): boolean => /:/.test(datetime) -const ONE_DAYH_IN_MS = 24 * 60 * 60 * 1000 const getLocalDropStatus = (drop: Pick): DropStatus => { const now = new Date() @@ -81,7 +80,7 @@ const getLocalDropStatus = (drop: Pick { const onSwapClick = () => { onTradeActionClick(() => { const nft = props.nft - const swap = swapStore.createSwap(nft.currentOwner) - - swapStore.updateItem({ - ...swap, - desired: [ - { - id: nft.id, - collectionId: nft.collection.id, - sn: nft.sn, - name: nft.name, - meta: nft.meta, - }, - ], + const swap = swapStore.createSwap(nft.currentOwner, { + desired: [nftToSwapItem(nft)], }) - navigateTo({ - name: 'prefix-swap-id', - params: { id: nft.currentOwner }, - query: { swapId: swap.id }, - }) + navigateToSwap(swap) }) } diff --git a/components/gallery/useGalleryItem.ts b/components/gallery/useGalleryItem.ts index 7743440a85..bbbc9a67e5 100644 --- a/components/gallery/useGalleryItem.ts +++ b/components/gallery/useGalleryItem.ts @@ -64,8 +64,12 @@ export const useGalleryItem = (nftId?: string): GalleryItem => { }, }) - const refreshToken = async () => { + const getIndexerToken = () => { refetch({ id }) + } + + const refreshToken = async () => { + getIndexerToken() getOdaToken() } @@ -120,7 +124,8 @@ export const useGalleryItem = (nftId?: string): GalleryItem => { id } }`, - onChange: refetch, + onChange: getIndexerToken, + immediate: false, }) useSubscriptionGraphql({ diff --git a/components/items/ItemsGrid/ItemsGrid.vue b/components/items/ItemsGrid/ItemsGrid.vue index b1dbb4d64c..a972ff4499 100644 --- a/components/items/ItemsGrid/ItemsGrid.vue +++ b/components/items/ItemsGrid/ItemsGrid.vue @@ -43,6 +43,7 @@ ? 'minimal' : 'primary' " + :link-target="linkTarget" />