Merge branch 'main' into issue-11038

kodadot · Oct 2, 2024 · 9dd5171 · 9dd5171
2 parents 1d98cac + 6fe3e47
commit 9dd5171
Show file tree

Hide file tree

Showing 32 changed files with 5,234 additions and 5,321 deletions.
diff --git a/components/Navbar.vue b/components/Navbar.vue
@@ -116,6 +116,7 @@
           </nuxt-link>
 
           <MobileExpandableSection
+            v-if="isExplorerVisible"
             v-slot="{ onCloseMobileSubMenu }"
             class="lg:!hidden"
             :title="$t('explore')"
@@ -130,6 +131,7 @@
             />
           </MobileExpandableSection>
           <NavbarExploreDropdown
+            v-if="isExplorerVisible"
             class="navbar-explore custom-navbar-item max-lg:!hidden"
             data-testid="explore"
           />
@@ -259,10 +261,9 @@ import NavbarChainOptions from '@/components/navbar/NavbarChainOptions.vue'
 import NavbarExploreOptions from '@/components/navbar/NavbarExploreOptions.vue'
 import Search from '@/components/search/Search.vue'
 import ConnectWalletButton from '@/components/shared/ConnectWalletButton.vue'
-
+import { explorerVisible, createVisible } from '@/utils/config/permission.config'
 import { useIdentityStore } from '@/stores/identity'
 import { getChainNameByPrefix } from '@/utils/chain'
-import { createVisible } from '@/utils/config/permission.config'
 
 const { neoModal } = useProgrammatic()
 const openMobileSearchBar = ref(false)
@@ -280,6 +281,7 @@ const mobilSearchRef = ref<{ focusInput: () => void } | null>(null)
 const account = computed(() => identityStore.getAuthAddress)
 
 const isCreateVisible = computed(() => createVisible(urlPrefix.value))
+const isExplorerVisible = computed(() => explorerVisible(urlPrefix.value))
 
 const logoSrc = computed(() => {
   const variant = isTouch ? 'Koda' : 'Koda_Beta'

diff --git a/composables/drop/useGenerativeDropMint.ts b/composables/drop/useGenerativeDropMint.ts
@@ -1,3 +1,4 @@
+import { isEthereumAddress } from '@polkadot/util-crypto'
 import { type DoResult, updateMetadata } from '@/services/fxart'
 import { useDrop } from '@/components/drops/useDrops'
 import useDropMassMintListing from '@/composables/drop/massmint/useDropMassMintListing'
@@ -65,7 +66,7 @@ export const useUpdateMetadata = async ({
     useSubscriptionGraphql({
       query: `
     nfts: nftEntities(
-      where: {collection: {id_eq: "${drop.value.collection}"}, blockNumber_eq: "${blockNumber.value}", currentOwner_eq: "${accountId.value}"},
+      where: {collection: {id_eq: "${drop.value.collection}"}, blockNumber_eq: "${blockNumber.value}", currentOwner_eq: "${isEthereumAddress(accountId.value) ? accountId.value.toLowerCase() : accountId.value}"},
       orderBy: [createdAt_ASC, sn_ASC]
     ) {
       id

diff --git a/composables/transaction/transactionMintDrop.ts b/composables/transaction/transactionMintDrop.ts
@@ -62,7 +62,7 @@ async function execEvmMintDrop({ executeTransaction }: EvmMintDropParams) {
     abi,
     arg,
     functionName,
-    value: drop.value.price,
+    value: String(Number(drop.value.price) * amountToMint.value),
   })
 }
 

diff --git a/composables/useUpdateProfile.ts b/composables/useUpdateProfile.ts
@@ -23,21 +23,22 @@ export default async ({
   hasProfile: boolean
   useFarcaster: boolean
 }) => {
-  const imageUrl = profileData.image
-    ? await uploadProfileImage({
-      file: profileData.image,
-      type: 'image',
-      signaturePair,
-    })
-    : profileData.imagePreview
-
-  const bannerUrl = profileData.banner
-    ? await uploadProfileImage({
-      file: profileData.banner,
-      type: 'banner',
-      signaturePair,
-    })
-    : profileData.bannerPreview
+  const [imageUrl, bannerUrl] = await Promise.all([
+    profileData.image
+      ? uploadProfileImage({
+        file: profileData.image,
+        type: 'image',
+        signaturePair,
+      })
+      : Promise.resolve(profileData.imagePreview),
+    profileData.banner
+      ? uploadProfileImage({
+        file: profileData.banner,
+        type: 'banner',
+        signaturePair,
+      })
+      : Promise.resolve(profileData.bannerPreview),
+  ])
 
   const profileBody: CreateProfileRequest | UpdateProfileRequest = {
     address: profileData.address,

diff --git a/locales/README.md b/locales/README.md
@@ -9,7 +9,7 @@ Particular commands you need to write to your terminal
 Look up on instructions at [First_Time](https://github.com/kodadot/nft-gallery/blob/main//content/blog/first-time.md#hyper-start-)
 
 1. If it is everything runs, that great!
-2. Now open in your editor your language .json file which is in `langDir`, for Spanish i.e. `es.json`
+2. Now open in your editor your language .json file which is in `locales`, for Spanish i.e. `es.json`
 3. Everytime you hit save, reload page to see your changes live.
 4. On the upper right you will see your flag. If you don't see your native language flag, [request new language at our Discord](https://discord.gg/kodadot), we can add your language!
 5. Once you are done, [make pull-request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)

diff --git a/locales/all_lang.json b/locales/all_lang.json
@@ -1,107 +1,81 @@
 {
+  "data": { "ksm": { "fee": "0.00007" } },
   "links": {
-    "kusama_network": {
-      "href": "https://kusama.network",
-      "docs": {
-        "mirror_learn_identity": {
-          "href": "https://guide.kusama.network/docs/learn-identity"
-        },
-        "existential_deposit": {
-          "href": "https://docs.kodadot.xyz/FAQ.html#what-is-existential-deposit-ed"
-        },
-        "minting_tutorial": {
-          "href": "https://docs.kodadot.xyz/tutorials/how-to-kodadot-phone-ios.html#how-to-mint-nfts-from-ios-device"
-        }
-      }
-    },
-    "kusama_scanner": {
-      "href": "https://kusama.subscan.io/",
-      "extrinsic": {
-        "href": "https://kusama.subscan.io/extrinsic/6095478-1"
-      }
-    },
-    "rmrk_credit": {
-      "href": "/rmrk/credit"
-    },
-    "rmrk_create": {
-      "href": "/rmrk/create"
-    },
-    "rmrk_profile": {
-      "href": "/rmrk/u"
-    },
+    "artist_grant_program": { "href": "https://form.kodadot.xyz/grant" },
     "binance_exchange": {
       "href": "https://accounts.binance.com/en/register?ref=T1JB89F0"
     },
-    "bybit_exchange": {
-      "href": "https://www.bybit.com/en-US/"
-    },
-    "simpleswap_exchange": {
-      "href": "https://simpleswap.io/?ref=6cc6e0c538ad"
+    "bybit_exchange": { "href": "https://www.bybit.com/en-US/" },
+    "chain_decision": {
+      "href": "https://github.com/kodadot/nft-gallery/issues/529"
     },
-    "polkadot_js_extension": {
-      "href": "https://polkadot.js.org/extension"
+    "coingecko_ksm_markets": {
+      "href": "https://www.coingecko.com/en/coins/kusama#markets"
     },
     "coingecko_ksm_price": {
       "href": "https://www.coingecko.com/en/coins/kusama"
     },
-    "coingecko_ksm_markets": {
-      "href": "https://www.coingecko.com/en/coins/kusama#markets"
-    },
-    "ramp_network": {
-      "href": "https://ramp.network",
-      "supported_countries": {
-        "href": "https://support.ramp.network/en/article/what-countries-do-you-support-1ua7sn1/"
+    "dotapps_io": {
+      "kusama_rpc_accounts": {
+        "href": "https://cloudflare-ipfs.com/ipns/dotapps.io/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/accounts"
+      },
+      "kusama_rpc_settings_metadata": {
+        "href": "https://cloudflare-ipfs.com/ipns/dotapps.io/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/settings/metadata"
       }
     },
-    "wikipedia": {
-      "nft": "https://en.wikipedia.org/wiki/Non-fungible_token"
-    },
     "kodadot_social": {
-      "discord": {
-        "href": "https://discord.gg/657ReTFf78"
-      },
-      "discord_help": {
-        "href": "https://discord.gg/7fMUnabf"
-      },
-      "twitter": {
-        "href": "https://twitter.com/kodadot"
+      "contributing_guide": {
+        "href": "https://github.com/kodadot/nft-gallery/blob/main/CONTRIBUTING.md"
       },
+      "discord": { "href": "https://discord.gg/657ReTFf78" },
+      "discord_help": { "href": "https://discord.gg/7fMUnabf" },
       "open_issues": {
         "href": "https://github.com/kodadot/nft-gallery/issues"
       },
-      "contributing_guide": {
-        "href": "https://github.com/kodadot/nft-gallery/blob/main/CONTRIBUTING.md"
-      },
       "presskit": {
         "href": "https://github.com/kodadot/kodadot-presskit/tree/main/v3"
-      }
-    },
-    "rmrk_spec_emote_issue": {
-      "href": "https://github.com/Swader/rmrk-spec/issues/10"
+      },
+      "twitter": { "href": "https://twitter.com/kodadot" }
     },
-    "chain_decision": {
-      "href": "https://github.com/kodadot/nft-gallery/issues/529"
+    "kusama_network": {
+      "docs": {
+        "existential_deposit": {
+          "href": "https://docs.kodadot.xyz/FAQ.html#what-is-existential-deposit-ed"
+        },
+        "minting_tutorial": {
+          "href": "https://docs.kodadot.xyz/tutorials/how-to-kodadot-phone-ios.html#how-to-mint-nfts-from-ios-device"
+        },
+        "mirror_learn_identity": {
+          "href": "https://guide.kusama.network/docs/learn-identity"
+        }
+      },
+      "href": "https://kusama.network"
     },
     "kusama_polkassembly": {
       "kodadot_nft_explorer_post": {
         "href": "https://kusama.polkassembly.io/post/384"
       }
     },
-    "dotapps_io": {
-      "kusama_rpc_settings_metadata": {
-        "href": "https://cloudflare-ipfs.com/ipns/dotapps.io/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/settings/metadata"
-      },
-      "kusama_rpc_accounts": {
-        "href": "https://cloudflare-ipfs.com/ipns/dotapps.io/?rpc=wss%3A%2F%2Fkusama-rpc.polkadot.io#/accounts"
+    "kusama_scanner": {
+      "extrinsic": { "href": "https://kusama.subscan.io/extrinsic/6095478-1" },
+      "href": "https://kusama.subscan.io/"
+    },
+    "polkadot_js_extension": { "href": "https://polkadot.js.org/extension" },
+    "ramp_network": {
+      "href": "https://ramp.network",
+      "supported_countries": {
+        "href": "https://support.ramp.network/en/article/what-countries-do-you-support-1ua7sn1/"
       }
     },
-    "artist_grant_program": {
-      "href": "https://form.kodadot.xyz/grant"
-    }
-  },
-  "data": {
-    "ksm": {
-      "fee": "0.00007"
-    }
+    "rmrk_create": { "href": "/rmrk/create" },
+    "rmrk_credit": { "href": "/rmrk/credit" },
+    "rmrk_profile": { "href": "/rmrk/u" },
+    "rmrk_spec_emote_issue": {
+      "href": "https://github.com/Swader/rmrk-spec/issues/10"
+    },
+    "simpleswap_exchange": {
+      "href": "https://simpleswap.io/?ref=6cc6e0c538ad"
+    },
+    "wikipedia": { "nft": "https://en.wikipedia.org/wiki/Non-fungible_token" }
   }
 }
diff --git a/locales/bn.json b/locales/bn.json
@@ -1,61 +1,61 @@
 {
-  "translation": "Bengali",
-  "create": "সৃষ্টি",
+  "Account": "অ্যাকাউন্ট",
+  "Accounts": "অ্যাকাউন্ট",
+  "Add Animated File": "অ্যানিমেটেড ফাইল যুক্ত করুন।",
+  "Add Token": "টোকেন যোগ করুন।",
+  "Add collection cover which will show up at collection view": "সংগ্রহের কভার আপলোড করুন, এটা ‘সংগ্রহ’ ভিউএ দেখাবে।",
+  "Click to add image": "ছবি যোগ করতে ক্লিক করুন।",
+  "Collection": "সংগ্রহ",
   "Create": "সৃষ্টি",
-  "credit": "সম্মান",
+  "Create your NFT Token & Collectibles": "আপনার এনএফটি টোকেন এবং সংগ্রহযোগ্যগুলি তৈরি করুন।",
   "Credit": "সম্মান",
-  "gallery": "গ্যালারী",
+  "Describe your collection, it will show under collection view": "আপনার সংগ্রহকে বর্ণনা করুণ, এটা 'সংগ্রহ' ভিউএর নিচে দেখাবে।",
+  "Description": "বিবরণ",
+  "Explorer": "এক্সপ্লোরার",
+  "Feedback? We\\'d be happy to discuss it.": "মতামত? আপনার মতামত আমাদের সাথে আলোচনা করুণ।",
   "Gallery": "গ্যালারী",
-  "accounts": "অ্যাকাউন্ট",
-  "Accounts": "অ্যাকাউন্ট",
-  "fullscreen": "পূর্ণপর্দা",
-  "newTab": " নতুন ট্যাবে খোলুন",
-  "transfer": "স্থানান্তর",
-  "Transfer": "স্থানান্তর",
-  "settings": "সেটিংস",
-  "Settings": "সেটিংস",
-  "first NFT market explorer on Kusama and Polkadot": "কুসামা এবং পোলকাডটের প্রথম এনএফটি মার্কেট এক্সপ্লোরার",
-  "legend": "লেজেন্ড",
-  "collection": "সংগ্রহ",
-  "Collection": "সংগ্রহ",
-  "owner": "অধিকারী",
-  "actions": "একশন",
-  "facts": "তথ্য",
-  "instance": "নজির",
+  "Gallery of NFT Tokens and Collectibles": "এনএফটি টোকেন এবং সংগ্রহযোগ্যগুলির গ্যালারী।",
+  "Image data": "চিত্রের ডেটা।",
   "Instance": "নজির",
-  "context": "প্রসঙ্গ",
-  "using": "ব্যবহার",
-  "computed id": "কম্পিউটেড আইডি",
-  "content": "বিষয়",
-  "create collection": "Create সংগ্রহ",
-  "Owner address of minted art": "মিন্ট করা শিল্পের অধিকারীর ঠিকানা",
-  "Name you want to show in gallery view": "যে নাম গ্যালারী ভিউএ দেখাতে চান।",
-  "Symbol you want to trade it under": "যে প্রতীক লাগিয়ে লেনদেন করতে চান।",
-  "Describe your collection, it will show under collection view": "আপনার সংগ্রহকে বর্ণনা করুণ, এটা 'সংগ্রহ' ভিউএর নিচে দেখাবে।",
-  "Add collection cover which will show up at collection view": "সংগ্রহের কভার আপলোড করুন, এটা ‘সংগ্রহ’ ভিউএ দেখাবে।",
-  "Select collection where do you want mint your token": "সংগ্রহ নির্বাচন করুণ, যেখানে আপনি টোকেন মিন্ট করবেন।",
+  "Instance_tooltip": "Instance হল মার্কেটপ্লেসের টিকারের মতো কোনও এনএফটি-এর সনাক্তকারী। এটা একটা \"ছোট, কম্প্যুটার-ফ্রেন্ডলি নাম।\"",
   "Maximum NFTs in collection": "সংগ্রহের সর্বাধিক এনএফটি।",
-  "Account": "অ্যাকাউন্ট",
-  "Name": "নাম",
-  "Symbol": "প্রতীক",
-  "Description": "বিবরণ",
-  "Multimedia data": "মাল্টিমিডিয়া ডেটা",
   "Metadata IPFS Hash": "মেটাডাটা IPFS হ্যাশ",
-  "Add Token": "টোকেন যোগ করুন।",
   "Mint": "মিন্ট করুণ",
-  "reload": "পুনরায়",
-  "Transferable is by default": "ডিফল্টরূপে স্থানান্তরযোগ্য",
-  "Serial Number": "ক্রমিক সংখ্যা",
+  "Multimedia data": "মাল্টিমিডিয়া ডেটা",
+  "Name": "নাম",
   "Name of your token": "আপনার টোকেনের নাম",
-  "Instance_tooltip": "Instance হল মার্কেটপ্লেসের টিকারের মতো কোনও এনএফটি-এর সনাক্তকারী। এটা একটা \"ছোট, কম্প্যুটার-ফ্রেন্ডলি নাম।\"",
-  "Upload will upload your image of the NFT": "আপলোড (Upload) আপনার এনএফটি এর চিত্র আপলোড করবে।",
-  "Click to add image": "ছবি যোগ করতে ক্লিক করুন।",
-  "Add Animated File": "অ্যানিমেটেড ফাইল যুক্ত করুন।",
-  "Image data": "চিত্রের ডেটা।",
-  "Explorer": "এক্সপ্লোরার",
-  "Gallery of NFT Tokens and Collectibles": "এনএফটি টোকেন এবং সংগ্রহযোগ্যগুলির গ্যালারী।",
-  "Create your NFT Token & Collectibles": "আপনার এনএফটি টোকেন এবং সংগ্রহযোগ্যগুলি তৈরি করুন।",
+  "Name you want to show in gallery view": "যে নাম গ্যালারী ভিউএ দেখাতে চান।",
   "New here? We have F.A.Q.": "এখানে নতুন? আমাদের সচরাচর জিজ্ঞাস্য (এফ.এ.কিউ) আছে।",
-  "Feedback? We\\'d be happy to discuss it.": "মতামত? আপনার মতামত আমাদের সাথে আলোচনা করুণ।",
-  "Read our story, how we started.": "আমাদের গল্পটি পড়ুন, আমরা কীভাবে শুরু করেছি।"
+  "Owner address of minted art": "মিন্ট করা শিল্পের অধিকারীর ঠিকানা",
+  "Read our story, how we started.": "আমাদের গল্পটি পড়ুন, আমরা কীভাবে শুরু করেছি।",
+  "Select collection where do you want mint your token": "সংগ্রহ নির্বাচন করুণ, যেখানে আপনি টোকেন মিন্ট করবেন।",
+  "Serial Number": "ক্রমিক সংখ্যা",
+  "Settings": "সেটিংস",
+  "Symbol": "প্রতীক",
+  "Symbol you want to trade it under": "যে প্রতীক লাগিয়ে লেনদেন করতে চান।",
+  "Transfer": "স্থানান্তর",
+  "Transferable is by default": "ডিফল্টরূপে স্থানান্তরযোগ্য",
+  "Upload will upload your image of the NFT": "আপলোড (Upload) আপনার এনএফটি এর চিত্র আপলোড করবে।",
+  "accounts": "অ্যাকাউন্ট",
+  "actions": "একশন",
+  "collection": "সংগ্রহ",
+  "computed id": "কম্পিউটেড আইডি",
+  "content": "বিষয়",
+  "context": "প্রসঙ্গ",
+  "create": "সৃষ্টি",
+  "create collection": "Create সংগ্রহ",
+  "credit": "সম্মান",
+  "facts": "তথ্য",
+  "first NFT market explorer on Kusama and Polkadot": "কুসামা এবং পোলকাডটের প্রথম এনএফটি মার্কেট এক্সপ্লোরার",
+  "fullscreen": "পূর্ণপর্দা",
+  "gallery": "গ্যালারী",
+  "instance": "নজির",
+  "legend": "লেজেন্ড",
+  "newTab": " নতুন ট্যাবে খোলুন",
+  "owner": "অধিকারী",
+  "reload": "পুনরায়",
+  "settings": "সেটিংস",
+  "transfer": "স্থানান্তর",
+  "translation": "Bengali",
+  "using": "ব্যবহার"
 }