Skip to content

Commit 9822a21

Browse files
Merge branch 'main' into update-webauthn-v2
2 parents 635d68d + 2591c75 commit 9822a21

File tree

13 files changed

+101
-67
lines changed

13 files changed

+101
-67
lines changed

.changeset/dirty-cups-tickle.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/flat-emus-repeat.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/gentle-kids-serve.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/green-bottles-approve.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/small-eagles-cry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/Mintable.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ import { useTxNotifications } from "hooks/useTxNotifications";
2727
import { CircleAlertIcon } from "lucide-react";
2828
import { useCallback } from "react";
2929
import { useForm } from "react-hook-form";
30-
import {
31-
type PreparedTransaction,
32-
prepareContractCall,
33-
sendAndConfirmTransaction,
34-
} from "thirdweb";
30+
import { type PreparedTransaction, sendAndConfirmTransaction } from "thirdweb";
3531
import { MintableERC721, MintableERC1155 } from "thirdweb/modules";
32+
import { grantRoles, hasAllRoles } from "thirdweb/modules";
3633
import { useReadContract } from "thirdweb/react";
3734
import type { NFTMetadataInputLimited } from "types/modified-types";
3835
import { parseAttributes } from "utils/parseAttributes";
@@ -79,10 +76,10 @@ function MintableModule(props: ModuleInstanceProps) {
7976
contract: contract,
8077
},
8178
);
82-
const hasMinterRole = useReadContract({
79+
const hasMinterRole = useReadContract(hasAllRoles, {
8380
contract: contract,
84-
method: "function hasAllRoles(address user, uint256 roles) returns (bool)",
85-
params: [ownerAccount?.address || "", MINTER_ROLE],
81+
user: ownerAccount?.address || "",
82+
roles: MINTER_ROLE,
8683
});
8784

8885
const isBatchMetadataInstalled = !!props.allModuleContractInfo.find(
@@ -97,10 +94,10 @@ function MintableModule(props: ModuleInstanceProps) {
9794
}
9895

9996
if (!hasMinterRole.data) {
100-
const grantRoleTx = prepareContractCall({
97+
const grantRoleTx = grantRoles({
10198
contract,
102-
method: "function grantRole(address user, uint256 role) public",
103-
params: [ownerAccount.address || "", MINTER_ROLE],
99+
user: ownerAccount.address,
100+
roles: MINTER_ROLE,
104101
});
105102

106103
await sendAndConfirmTransaction({

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-instance.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function ModuleInstance(props: ModuleInstanceProps) {
3131
return <TransferableModule {...props} />;
3232
}
3333

34-
if (props.contractInfo.name.includes("Mintable-ignore")) {
34+
if (props.contractInfo.name.includes("Mintable")) {
3535
return <MintableModule {...props} />;
3636
}
3737

packages/service-utils/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @thirdweb-dev/service-utils
22

3+
## 0.4.49
4+
5+
### Patch Changes
6+
7+
- [#5409](https://github.com/thirdweb-dev/js/pull/5409) [`e841bfe`](https://github.com/thirdweb-dev/js/commit/e841bfe0817e190d7ba3f17cc6d953ba0b60c64f) Thanks [@iuwqyir](https://github.com/iuwqyir)! - remove nebula scope
8+
39
## 0.4.48
410

511
### Patch Changes

packages/service-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@thirdweb-dev/service-utils",
3-
"version": "0.4.48",
3+
"version": "0.4.49",
44
"type": "module",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

packages/thirdweb/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# thirdweb
22

3+
## 5.69.0
4+
5+
### Minor Changes
6+
7+
- [#5415](https://github.com/thirdweb-dev/js/pull/5415) [`7b21f1b`](https://github.com/thirdweb-dev/js/commit/7b21f1b632d65a2bc9bc38656e18d220c6201ed9) Thanks [@gregfromstl](https://github.com/gregfromstl)! - Adds steam auth
8+
9+
- [#5415](https://github.com/thirdweb-dev/js/pull/5415) [`7b21f1b`](https://github.com/thirdweb-dev/js/commit/7b21f1b632d65a2bc9bc38656e18d220c6201ed9) Thanks [@gregfromstl](https://github.com/gregfromstl)! - Adds Steam as an authentication option
10+
11+
### Patch Changes
12+
13+
- [#5397](https://github.com/thirdweb-dev/js/pull/5397) [`895b4d1`](https://github.com/thirdweb-dev/js/commit/895b4d145fb0519febdb399abffea36208692d95) Thanks [@MananTank](https://github.com/MananTank)! - Catch localStorage getItem and setItem unhandled errors
14+
15+
- [#5440](https://github.com/thirdweb-dev/js/pull/5440) [`f01de73`](https://github.com/thirdweb-dev/js/commit/f01de732fbf726cc0114dc645414f0ee6a37eb8e) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Support erc6492 signature verification on zksync
16+
317
## 5.68.0
418

519
### Minor Changes

0 commit comments

Comments
 (0)