Skip to content

Commit 8066ab0

Browse files
ElasticBottleElasticBottle
authored
Merge branch 'main' into winston/update-in-app-wallet-user-api
2 parents 1c6c40a + ad4af68 commit 8066ab0

File tree

7 files changed

+75
-41
lines changed

7 files changed

+75
-41
lines changed

‎.changeset/cold-eels-crash.md‎

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

‎.changeset/smart-chicken-beam.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Reduce async calls before requesting webauthn credentials for ios 15

‎.changeset/sweet-days-admire.md‎

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

‎.changeset/wicked-gifts-joke.md‎

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

‎packages/thirdweb/CHANGELOG.md‎

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

3+
## 5.64.3
4+
5+
### Patch Changes
6+
7+
- [#5207](https://github.com/thirdweb-dev/js/pull/5207) [`adeda1e`](https://github.com/thirdweb-dev/js/commit/adeda1ef7629bb31fe5280c26f4d53218d7bea82) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Handle unsupported Pay chains properly for sending paid transactions
8+
9+
- [#5176](https://github.com/thirdweb-dev/js/pull/5176) [`84571ef`](https://github.com/thirdweb-dev/js/commit/84571efaf80bc7b9054a375233beb8789326255d) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Redesigned Pay payment selection flow
10+
11+
- [#5212](https://github.com/thirdweb-dev/js/pull/5212) [`07ea65b`](https://github.com/thirdweb-dev/js/commit/07ea65bcd8141076c8b557628df3da7823455324) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Better handling of ecosystem smart accounts
12+
313
## 5.64.2
414

515
### Patch Changes

‎packages/thirdweb/package.json‎

Lines changed: 55 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "thirdweb",
3-
"version": "5.64.2",
3+
"version": "5.64.3",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -127,24 +127,60 @@
127127
},
128128
"typesVersions": {
129129
"*": {
130-
"adapters/*": ["./dist/types/exports/adapters/*.d.ts"],
131-
"auth": ["./dist/types/exports/auth.d.ts"],
132-
"chains": ["./dist/types/exports/chains.d.ts"],
133-
"contract": ["./dist/types/exports/contract.d.ts"],
134-
"deploys": ["./dist/types/exports/deploys.d.ts"],
135-
"event": ["./dist/types/exports/event.d.ts"],
136-
"extensions/*": ["./dist/types/exports/extensions/*.d.ts"],
137-
"pay": ["./dist/types/exports/pay.d.ts"],
138-
"react": ["./dist/types/exports/react.d.ts"],
139-
"react-native": ["./dist/types/exports/react-native.d.ts"],
140-
"rpc": ["./dist/types/exports/rpc.d.ts"],
141-
"storage": ["./dist/types/exports/storage.d.ts"],
142-
"transaction": ["./dist/types/exports/transaction.d.ts"],
143-
"utils": ["./dist/types/exports/utils.d.ts"],
144-
"wallets": ["./dist/types/exports/wallets.d.ts"],
145-
"wallets/*": ["./dist/types/exports/wallets/*.d.ts"],
146-
"modules": ["./dist/types/exports/modules.d.ts"],
147-
"social": ["./dist/types/exports/social.d.ts"]
130+
"adapters/*": [
131+
"./dist/types/exports/adapters/*.d.ts"
132+
],
133+
"auth": [
134+
"./dist/types/exports/auth.d.ts"
135+
],
136+
"chains": [
137+
"./dist/types/exports/chains.d.ts"
138+
],
139+
"contract": [
140+
"./dist/types/exports/contract.d.ts"
141+
],
142+
"deploys": [
143+
"./dist/types/exports/deploys.d.ts"
144+
],
145+
"event": [
146+
"./dist/types/exports/event.d.ts"
147+
],
148+
"extensions/*": [
149+
"./dist/types/exports/extensions/*.d.ts"
150+
],
151+
"pay": [
152+
"./dist/types/exports/pay.d.ts"
153+
],
154+
"react": [
155+
"./dist/types/exports/react.d.ts"
156+
],
157+
"react-native": [
158+
"./dist/types/exports/react-native.d.ts"
159+
],
160+
"rpc": [
161+
"./dist/types/exports/rpc.d.ts"
162+
],
163+
"storage": [
164+
"./dist/types/exports/storage.d.ts"
165+
],
166+
"transaction": [
167+
"./dist/types/exports/transaction.d.ts"
168+
],
169+
"utils": [
170+
"./dist/types/exports/utils.d.ts"
171+
],
172+
"wallets": [
173+
"./dist/types/exports/wallets.d.ts"
174+
],
175+
"wallets/*": [
176+
"./dist/types/exports/wallets/*.d.ts"
177+
],
178+
"modules": [
179+
"./dist/types/exports/modules.d.ts"
180+
],
181+
"social": [
182+
"./dist/types/exports/social.d.ts"
183+
]
148184
}
149185
},
150186
"browser": {

‎packages/thirdweb/src/wallets/in-app/core/authentication/passkeys.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,19 +137,17 @@ export async function loginWithPasskey(options: {
137137
}
138138
const fetchWithId = getClientFetch(options.client, options.ecosystem);
139139
// 1. request challenge from server/iframe
140-
const res = await fetchWithId(getChallengePath("sign-in"));
141-
const challengeData = await res.json();
140+
const [challengeData, credentialId] = await Promise.all([
141+
fetchWithId(getChallengePath("sign-in")).then((r) => r.json()),
142+
options.storage?.getPasskeyCredentialId(),
143+
]);
142144
if (!challengeData.challenge) {
143145
throw new Error("No challenge received");
144146
}
145147
const challenge = challengeData.challenge;
146-
// 1.2. find the user's credentialId in local storage
147-
const credentialId =
148-
(await options.storage?.getPasskeyCredentialId()) ?? undefined;
149-
150148
// 2. initiate login
151149
const authentication = await options.passkeyClient.authenticate({
152-
credentialId,
150+
credentialId: credentialId ?? undefined,
153151
challenge,
154152
rp: options.rp,
155153
});

0 commit comments

Comments
 (0)