Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 29e50ba

Browse files
kumaryash90kumaryash90
authored
Merge branch 'main' into yash/resolve-beacon
2 parents 9be4d30 + 0f9b88a commit 29e50ba

File tree

98 files changed

+2408
-2186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2408
-2186
lines changed

‎.changeset/ten-jokes-tickle.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@thirdweb-dev/react-core": patch
3+
---
4+
5+
Fix return type of `useUnclaimedNFTs` hook.
6+
7+
This fixes https://github.com/thirdweb-dev/js/issues/2110

‎.changeset/tidy-falcons-listen.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
"@thirdweb-dev/react-native": minor
3+
"@thirdweb-dev/react-core": minor
4+
"@thirdweb-dev/wallets": patch
5+
"@thirdweb-dev/react": minor
6+
---
7+
8+
- Fix double connection issue when Connecting a Safe / Smart Wallet. Now the personal wallet will not be set as the active wallet - only the final wallet will be set as the active wallet. This fixes the issue of hooks like `useWallet`, `useAddress`, `useConnectionStatus` etc showing the wrong wallet / address / connection status for a brief moment when connecting a Safe / Smart Wallet.
9+
10+
- Add `ConnectEmbed` component and `useShowConnectEmbed` hook to allow for embedding the ConnectWallet's Modal directly into the page.
11+
- `useShowConnectEmbed` returns `true`` if the `<ConnectEmbed />`should be rendered. It returns`true`` if either one of the following conditions are met:
12+
13+
- the wallet is NOT connected
14+
- the wallet IS connected but the user is NOT signed in and `auth` is required ( loginOptional is NOT set to false )
15+
16+
```tsx
17+
function Example() {
18+
const loginOptional = false;
19+
const showConnectEmbed = useShowConnectEmbed(loginOptional);
20+
21+
if (!showConnectEmbed) {
22+
return <div> Wallet is connected </div>;
23+
}
24+
25+
return (
26+
<ConnectEmbed
27+
auth={{
28+
loginOptional,
29+
}}
30+
/>
31+
);
32+
}
33+
```
34+
35+
- Show "Disconnect Wallet" option in "Sign in" Screen and don't disconnect wallet instead of disconnecting the wallet when "Sign in" screen is dismissed by closing the modal. This makes this screen reusable for both ConnectWallet and ConnectEmbed components and also improves the user experience.

‎.github/workflows/build-test-lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup bun
3535
uses: oven-sh/setup-bun@v1
3636
with:
37-
bun-version: latest
37+
bun-version: 1.0.21
3838

3939
- name: Install
4040
uses: ./.github/composite-actions/install
@@ -67,7 +67,7 @@ jobs:
6767
- name: Setup bun
6868
uses: oven-sh/setup-bun@v1
6969
with:
70-
bun-version: latest
70+
bun-version: 1.0.21
7171

7272
- uses: pnpm/action-setup@v2
7373
with:
@@ -98,7 +98,7 @@ jobs:
9898
- name: Setup bun
9999
uses: oven-sh/setup-bun@v1
100100
with:
101-
bun-version: latest
101+
bun-version: 1.0.21
102102

103103
- uses: pnpm/action-setup@v2
104104
with:
@@ -134,7 +134,7 @@ jobs:
134134
- name: Setup bun
135135
uses: oven-sh/setup-bun@v1
136136
with:
137-
bun-version: latest
137+
bun-version: 1.0.21
138138

139139
- uses: pnpm/action-setup@v2
140140
with:

‎.github/workflows/release-next.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup bun
3030
uses: oven-sh/setup-bun@v1
3131
with:
32-
bun-version: latest
32+
bun-version: 1.0.21
3333

3434
- name: Install
3535
uses: ./.github/composite-actions/install

‎.github/workflows/release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Setup bun
7171
uses: oven-sh/setup-bun@v1
7272
with:
73-
bun-version: latest
73+
bun-version: 1.0.21
7474

7575
- name: Install
7676
uses: ./.github/composite-actions/install

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup bun
3030
uses: oven-sh/setup-bun@v1
3131
with:
32-
bun-version: latest
32+
bun-version: 1.0.21
3333

3434
- name: Install
3535
uses: ./.github/composite-actions/install

‎.github/workflows/sync-chains.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414

1515
- name: Install bun
1616
uses: oven-sh/setup-bun@v1
17+
with:
18+
bun-version: 1.0.21
1719

1820
- name: Run chains sync
1921
run: bun run db:sync

0 commit comments

Comments
 (0)