Skip to content

Commit

Permalink
🔀 Merge main to deploy/rinkeby
Browse files Browse the repository at this point in the history
  • Loading branch information
williamchong committed Sep 13, 2024
2 parents bed6bc5 + 6381adf commit 4e26427
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
3 changes: 3 additions & 0 deletions components/NFTMint/WriterMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

<template v-if="shouldShowSettings">
<div
v-if="!isNewsPress"
class="flex flex-col justify-start gap-[32px] p-[20px] pb-[24px] border-2 border-[#E6F4F2] rounded-[16px] w-full"
>
<Label
Expand Down Expand Up @@ -149,6 +150,7 @@
</select>
</div>
<div
v-if="!isNewsPress"
class="flex justify-between gap-[12px] text-dark-gray text-[14px] items-center"
>
<label>
Expand Down Expand Up @@ -179,6 +181,7 @@ export default class WriterMessage extends Vue {
@Prop(Number) readonly mintAmount!: number
@Prop(Number) readonly maxMintAmount!: number
@Prop(String) readonly collectExpiryDate!: string
@Prop(Boolean) readonly isNewsPress!: boolean
userInfo: any = undefined
avatar: string = ''
Expand Down
8 changes: 6 additions & 2 deletions nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ export default {
release: RELEASE,
},
tracing: {
tracesSampleRate: IS_TESTNET ? 1.0 : 0.1,
// TODO: remove health check http calls from tracing
tracesSampleRate: IS_TESTNET ? 0.01 : 0.01,
browserTracing: {},
vueOptions: {
trackComponents: true,
Expand All @@ -187,7 +188,10 @@ export default {
Replay: {},
},
clientConfig: {
ignoreErrors: ['WebAssembly.instantiate'],
ignoreErrors: [
'WebAssembly.instantiate',
'["@context"].toLowerCase',
],
replaysSessionSampleRate: IS_TESTNET ? 1.0 : 0.05,
replaysOnErrorSampleRate: IS_TESTNET ? 1.0 : 1.0,
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@keplr-wallet/types": "^0.11.4",
"@likecoin/iscn-js": "^0.6.10",
"@likecoin/iscn-message-types": "^0.0.7",
"@likecoin/wallet-connector": "^0.26.7-beta.0",
"@likecoin/wallet-connector": "^0.26.7",
"@nuxtjs/axios": "^5.13.6",
"@nuxtjs/i18n": "^7.0.1",
"@nuxtjs/sentry": "^8.0.7",
Expand Down
3 changes: 3 additions & 0 deletions pages/nft/iscn/_iscnId.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
:max-mint-amount="maxMintAmount"
:reserve-amount.sync="reserveNft"
:collect-expiry-date.sync="collectExpiryDate"
:is-news-press="isNewsPress"
@message-change="(value) => (message = value)"
@update-mint-amount.once="handleInputMintAmount"
@update-reserve.once="handleInputReserveNft"
Expand Down Expand Up @@ -226,6 +227,8 @@ export default class NFTMintPage extends Vue {
@walletModule.Getter('getSigner') signer!: OfflineSigner | null
platform = this.$route.query.platform as string || ''
isNewsPress = !!this.$route.query.news_press && this.$route.query.news_press !== '0'
classId: string = ''
nftsIds: string[] = []
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3935,10 +3935,10 @@
fast-json-stable-stringify "^2.0.0"
lodash "^4.17.15"

"@likecoin/wallet-connector@^0.26.7-beta.0":
version "0.26.7-beta.0"
resolved "https://registry.yarnpkg.com/@likecoin/wallet-connector/-/wallet-connector-0.26.7-beta.0.tgz#905ceb0b3e34da64c466bd1b839aca3cad4d759e"
integrity sha512-Wj9R/GijPSuPJVWDrE7D4HNVi2Fp+bHZtLFwfjrpDgDOS3C+OYfIRm9rOWzy3ECrJr19Id98QLwspXMBXDM6cQ==
"@likecoin/wallet-connector@^0.26.7":
version "0.26.7"
resolved "https://registry.yarnpkg.com/@likecoin/wallet-connector/-/wallet-connector-0.26.7.tgz#919b5a407240994e67b67e2b9b2087c2df758987"
integrity sha512-1jD/it3IWDSzGUN8ycTTtNLtvauRrHfHlL43caZip/hKPsTzJfOn9TXmbghQB1r4OVdbJEj7Lekl0WankZHeRg==
dependencies:
"@cosmjs/proto-signing" "^0.28.13"
"@headlessui/react" "1.7.11"
Expand Down

0 comments on commit 4e26427

Please sign in to comment.