Skip to content

Commit 9178ad3

Browse files
Merge branch 'main' into winston/cnct-2522-unable-to-log-in-to-ecosystem-wallet-and-xai-connect
2 parents 653b520 + 68ad62f commit 9178ad3

File tree

21 files changed

+418
-118
lines changed

21 files changed

+418
-118
lines changed

.changeset/curly-ligers-exist.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+
update `type` in `getUser` `Profiles` to match tyepscript types

.changeset/silver-weeks-rescue.md

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

.changeset/stupid-buses-wink.md

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

.changeset/wild-games-vanish.md

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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apps/ @jnsdls @joaquim-verges
2020
apps/dashboard/ @jnsdls @MananTank @joaquim-verges
2121
apps/playground-web/ @joaquim-verges @gregfromstl @jnsdls @joaquim-verges
2222
apps/wallet-ui/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23-
apps/portal/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23+
apps/portal/ @thirdweb-dev/product @thirdweb-dev/platform @thirdweb-dev/infra
2424

2525
# .github folder + .changeset + turbo config is owned by jonas for now
2626
scripts/ @jnsdls @joaquim-verges

apps/dashboard/framer-rewrites.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ module.exports = [
88
"/connect/sign-in",
99
// -- nebula
1010
"/nebula",
11+
// --insight
12+
"/insight",
1113
// -- contracts
1214
"/contracts",
1315
"/contracts/modular-contracts",

apps/portal/src/app/react-native/v5/getting-started/page.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ npx expo install thirdweb @thirdweb-dev/react-native-adapter
3636
Since react native requires installing native dependencies directly, you also have to install these required peer dependencies:
3737

3838
```shell
39-
npx expo install react-native-get-random-values @react-native-community/netinfo expo-application @react-native-async-storage/async-storage expo-web-browser expo-linking react-native-aes-gcm-crypto react-native-quick-crypto amazon-cognito-identity-js @coinbase/wallet-mobile-sdk react-native-mmkv react-native-svg
39+
npx expo install react-native-get-random-values @react-native-community/netinfo expo-application @react-native-async-storage/async-storage expo-web-browser expo-linking react-native-aes-gcm-crypto react-native-quick-crypto amazon-cognito-identity-js @coinbase/wallet-mobile-sdk react-native-mmkv react-native-svg @walletconnect/react-native-compat react-native-passkey
4040
```
4141

4242
Here's an explanation of each peer dependency and why its needed:
@@ -168,13 +168,13 @@ npx expo prebuild
168168
Run the development build on ios:
169169

170170
```shell
171-
npx expo:run ios
171+
npx expo run:ios
172172
```
173173

174174
Run the development build on android:
175175

176176
```shell
177-
npx expo:run android
177+
npx expo run:android
178178
```
179179

180180
</Step>

apps/portal/src/app/react-native/v5/troubleshooting/page.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ npx expo prebuild
1313
You can then run the development build using the following command:
1414

1515
```shell
16-
npx expo:run ios
16+
npx expo run:ios
1717
```
1818

1919
```shell
20-
npx expo:run android
20+
npx expo run:android
2121
```
2222

2323
## OpenSSL iOS build error

packages/react-native-adapter/CHANGELOG.md

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

3+
## 1.5.2
4+
5+
### Patch Changes
6+
7+
- [#5594](https://github.com/thirdweb-dev/js/pull/5594) [`b7c8854`](https://github.com/thirdweb-dev/js/commit/b7c885432726eeaf3401217573f2cff0f5247ff7) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Support for Expo 52 and React Native 0.76
8+
39
## 1.5.1
410

511
### Patch Changes

packages/react-native-adapter/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@thirdweb-dev/react-native-adapter",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -31,8 +31,7 @@
3131
"@aws-sdk/client-kms": "3.699.0",
3232
"@aws-sdk/client-lambda": "3.699.0",
3333
"@aws-sdk/credential-providers": "3.699.0",
34-
"@mobile-wallet-protocol/client": "0.1.2",
35-
"@walletconnect/react-native-compat": "2.17.2"
34+
"@mobile-wallet-protocol/client": "0.1.2"
3635
},
3736
"devDependencies": {
3837
"rimraf": "6.0.1"
@@ -41,9 +40,10 @@
4140
"@coinbase/wallet-mobile-sdk": "^1",
4241
"@react-native-async-storage/async-storage": "^1 || ^2",
4342
"@react-native-community/netinfo": "^11",
44-
"expo-application": "^5",
43+
"@walletconnect/react-native-compat": "^2",
44+
"expo-application": "^5 || ^6",
4545
"expo-linking": "^6",
46-
"expo-web-browser": "^13",
46+
"expo-web-browser": "^13 || ^14",
4747
"react-native": ">=0.70",
4848
"react-native-aes-gcm-crypto": "^0.2",
4949
"react-native-get-random-values": "^1",

0 commit comments

Comments
 (0)