Merge branch 'main' into issue-revert-create

hassnian · Jul 18, 2024 · d5443ab · d5443ab
2 parents c8038e7 + ff87389
commit d5443ab
Show file tree

Hide file tree

Showing 22 changed files with 786 additions and 445 deletions.
diff --git a/components/collection/HeroButtons.vue b/components/collection/HeroButtons.vue
@@ -82,14 +82,10 @@
         </NeoDropdown>
       </div>
     </div>
-    <NeoModal :value="QRModalActive" @close="QRModalActive = false">
-      <div class="card" data-testid="hero-share-qrcode-modal">
-        <header class="card-header">
-          <p class="card-header-title">{{ collection?.name }}</p>
-        </header>
-        <div class="card-content">
-          <QRCode :text="currentCollectionUrl" />
-        </div>
+    <NeoModal :value="QRModalActive" header="" @close="QRModalActive = false">
+      <NeoModalHead :title="collection?.name" @close="QRModalActive = false" />
+      <div class="card-content" data-testid="hero-share-qrcode-modal">
+        <QRCode :text="currentCollectionUrl" />
       </div>
     </NeoModal>
   </div>
@@ -102,6 +98,7 @@ import {
   NeoDropdownItem,
   NeoIcon,
   NeoModal,
+  NeoModalHead,
 } from '@kodadot1/brick'
 import { useCollectionMinimal } from '@/components/collection/utils/useCollectionDetails'
 import { hasOperationsDisabled } from '@/utils/prefix'

diff --git a/components/collection/drop/AddFundsModal.vue b/components/collection/drop/AddFundsModal.vue
@@ -1,7 +1,6 @@
 <template>
   <NeoModal
     :value="modelValue"
-    :can-cancel="['outside', 'escape']"
     content-class="add-funds-modal !w-[unset]"
     @close="onClose">
     <ModalBody

diff --git a/components/collection/drop/modal/PaidMint.vue b/components/collection/drop/modal/PaidMint.vue
@@ -1,8 +1,5 @@
 <template>
-  <NeoModal
-    :value="modelValue"
-    :can-cancel="isSigningStep ? false : ['outside', 'escape']"
-    @close="close">
+  <NeoModal :value="modelValue" @close="close">
     <ModalBody
       :title="title"
       :scrollable="false"

diff --git a/components/collection/unlockable/UnlockableLoader.vue b/components/collection/unlockable/UnlockableLoader.vue
diff --git a/components/common/autoTeleport/AutoTeleportModal.vue b/components/common/autoTeleport/AutoTeleportModal.vue
@@ -1,9 +1,5 @@
 <template>
-  <NeoModal
-    :value="isModalActive"
-    :can-cancel="canCancel"
-    class="z-[1000]"
-    @close="onClose">
+  <NeoModal :value="isModalActive" class="z-[1000]" @close="onClose">
     <div class="sm:w-[25rem]">
       <ModalBody
         :title="$i18n.t('autoTeleport.signTransactions')"
@@ -215,10 +211,6 @@ const autoteleportFinalized = computed(() =>
     : hasCompletedActionPreSteps.value,
 )
 
-const canCancel = computed(() =>
-  autoteleportFinalized.value ? ['outside', 'escape'] : false,
-)
-
 const btnLabel = computed<string>(() => {
   if (!hasActions.value && isBalanceCheckCompleted.value) {
     return $i18n.t('redirect.continue')

diff --git a/components/common/autoTeleport/AutoTeleportWelcomeModal.vue b/components/common/autoTeleport/AutoTeleportWelcomeModal.vue
@@ -1,9 +1,5 @@
 <template>
-  <NeoModal
-    :value="isModalActive"
-    :can-cancel="['outside', 'escape']"
-    class="z-[1000]"
-    @close="onClose">
+  <NeoModal :value="isModalActive" class="z-[1000]" @close="onClose">
     <div class="sm:w-[40rem]">
       <header class="py-5 pl-6 pr-5 flex justify-between items-center">
         <span class="capitalize text-[1.6rem] font-bold">

diff --git a/components/common/confirmPurchaseModal/ConfirmPurchaseModal.vue b/components/common/confirmPurchaseModal/ConfirmPurchaseModal.vue
@@ -1,7 +1,6 @@
 <template>
   <NeoModal
     :value="isModalActive"
-    :can-cancel="['outside', 'escape']"
     class="z-[1000]"
     content-class="!w-[unset]"
     @close="onClose">

diff --git a/components/common/successfulModal/SuccessfulModal.vue b/components/common/successfulModal/SuccessfulModal.vue
@@ -1,8 +1,5 @@
 <template>
-  <NeoModal
-    :value="isModalActive"
-    :can-cancel="['outside', 'escape']"
-    @close="onClose">
+  <NeoModal :value="isModalActive" @close="onClose">
     <ModalBody :title="$t('success')" @close="onClose">
       <SuccessfulModalBody
         :tx-hash="txHash"

diff --git a/components/drops/CreateCalendarEventModal.vue b/components/drops/CreateCalendarEventModal.vue
@@ -1,8 +1,5 @@
 <template>
-  <NeoModal
-    :value="isModalActive"
-    :can-cancel="['outside', 'escape']"
-    @close="onClose">
+  <NeoModal :value="isModalActive" @close="onClose">
     <ModalBody :title="$t('drops.createACalendarEvent')" @close="onClose">
       <p class="capitalize">
         {{ title }}

diff --git a/components/identity/IdentityIndex.vue b/components/identity/IdentityIndex.vue
@@ -63,7 +63,10 @@ const showIdentityBadge = computed(() =>
   Boolean(props.showBadge && hasIdentity.value),
 )
 
-provide('address', props.address)
+provide(
+  'address',
+  computed(() => props.address),
+)
 provide(
   'shortenedAddress',
   computed(() => shortenedAddress.value),

diff --git a/components/identity/module/IdentityPopoverFooter.vue b/components/identity/module/IdentityPopoverFooter.vue
@@ -57,7 +57,7 @@ const GalleryCard = defineAsyncComponent(
 
 const NFT_AMOUNT = 2
 
-const address = inject('address') as string
+const address = inject('address') as ComputedRef<string>
 
 const { urlPrefix } = usePrefix()
 const { totalCreated } = useIdentityStats({
@@ -68,7 +68,9 @@ const {
   data: followersData,
   refresh,
   pending: loading,
-} = useAsyncData(() => fetchFollowersOf(address))
+} = useAsyncData(`followers-${address.value}`, () =>
+  fetchFollowersOf(address.value),
+)
 
 const followers = computed(() =>
   loading.value ? 0 : followersData.value?.totalCount || 0,
@@ -82,12 +84,12 @@ const { data } = useSearchNfts({
           OR: [
             {
               // created
-              issuer_eq: address,
+              issuer_eq: address.value,
             },
             {
               // bought
-              issuer_not_eq: address,
-              currentOwner_eq: address,
+              issuer_not_eq: address.value,
+              currentOwner_eq: address.value,
             },
           ],
         },

diff --git a/components/identity/utils/useIdentityStats.ts b/components/identity/utils/useIdentityStats.ts
@@ -4,13 +4,13 @@ import { useIdentityMintStore } from '@/stores/identityMint'
 import { formatToNow } from '@/utils/format/time'
 import buyEventByProfile from '@/queries/subsquid/general/buyEventByProfile.query'
 
-const useLastBought = ({ address }) => {
+const useLastBought = ({ address }: { address: Ref<string> }) => {
   const lastBoughtDate = ref(new Date())
 
   const { data } = useAsyncQuery({
     query: buyEventByProfile,
     variables: {
-      id: address,
+      id: address.value,
     },
   })
 
@@ -55,7 +55,11 @@ const cacheTotalCount = ({ data, totalCreated }) => {
   return cacheData
 }
 
-export default function useIdentityStats({ address }) {
+export default function useIdentityStats({
+  address,
+}: {
+  address: Ref<string>
+}) {
   const identityMintStore = useIdentityMintStore()
 
   const totalCreated = ref(0)
@@ -65,7 +69,7 @@ export default function useIdentityStats({ address }) {
   const { data: stats } = useGraphql({
     queryName: 'userStatsByAccount',
     variables: {
-      account: address,
+      account: address.value,
     },
   })
 
@@ -88,14 +92,14 @@ export default function useIdentityStats({ address }) {
     firstMintDate.value = cacheData.firstMintDate
 
     identityMintStore.setIdentity({
-      address,
+      address: address.value,
       cacheData,
     })
   }
 
   const fetchNFTStats = () => {
     // if cache exist and within 12h
-    const data = identityMintStore.getIdentityMintFor(address)
+    const data = identityMintStore.getIdentityMintFor(address.value)
     if (data?.updatedAt && isAfter(data.updatedAt, subHours(Date.now(), 12))) {
       return handleNFTStats({ data, type: 'cache' })
     }

diff --git a/components/shared/TransactionLoader.vue b/components/shared/TransactionLoader.vue
@@ -102,7 +102,7 @@ const props = withDefaults(
     isMobile?: boolean
   }>(),
   {
-    canCancel: true,
+    canCancel: false,
     isMobile: false,
   },
 )

diff --git a/libs/static/package.json b/libs/static/package.json
@@ -34,7 +34,7 @@
     "changelogen": "^0.5.5",
     "eslint": "^8.57.0",
     "eslint-config-unjs": "^0.3.2",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "typescript": "^5.5.3",
     "unbuild": "^2.0.0",
     "vitest": "^1.6.0"

diff --git a/libs/ui/package.json b/libs/ui/package.json
@@ -18,7 +18,7 @@
     "eslint-plugin-vue": "^8.7.1",
     "histoire": "0.17.6",
     "postcss": "^8.4.39",
-    "tailwindcss": "^3.4.4"
+    "tailwindcss": "^3.4.5"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.4.2",

diff --git a/libs/ui/src/components/NeoModal/NeoModal.vue b/libs/ui/src/components/NeoModal/NeoModal.vue
@@ -45,7 +45,7 @@ const props = withDefaults(
   }>(),
   {
     destroyOnHide: true,
-    canCancel: true,
+    canCancel: false,
     fullScreen: false,
     contentClass: '',
     rootClass: '',

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -398,10 +398,13 @@ export default defineNuxtConfig({
         '3fcc6bba6f1de962d911bb5b5c3dba68', // WalletConnect project ID from `https://wagmi.sh/core/api/connectors/walletConnect#projectid`
     },
   },
+
   // In case of using ssr
   // privateRuntimeConfig: {}
 
   devtools: {
     enabled: true,
   },
+
+  compatibilityDate: '2024-07-11',
 })