Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .changeset/new-olives-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
'@reown/appkit-scaffold-react-native': patch
'@reown/appkit-ethers5-react-native': patch
'@reown/appkit-ethers-react-native': patch
'@reown/appkit-wagmi-react-native': patch
'@reown/appkit-auth-ethers-react-native': patch
'@reown/appkit-auth-wagmi-react-native': patch
'@reown/appkit-coinbase-ethers-react-native': patch
'@reown/appkit-coinbase-wagmi-react-native': patch
'@reown/appkit-common-react-native': patch
'@reown/appkit-core-react-native': patch
'@reown/appkit-scaffold-utils-react-native': patch
'@reown/appkit-siwe-react-native': patch
'@reown/appkit-ui-react-native': patch
'@reown/appkit-wallet-react-native': patch
---

fix: set empty required chains for connections + updated ethereum provider version
18 changes: 18 additions & 0 deletions .changeset/soft-waves-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
'@reown/appkit-scaffold-react-native': patch
'@reown/appkit-ethers5-react-native': patch
'@reown/appkit-ethers-react-native': patch
'@reown/appkit-wagmi-react-native': patch
'@reown/appkit-auth-ethers-react-native': patch
'@reown/appkit-auth-wagmi-react-native': patch
'@reown/appkit-coinbase-ethers-react-native': patch
'@reown/appkit-coinbase-wagmi-react-native': patch
'@reown/appkit-common-react-native': patch
'@reown/appkit-core-react-native': patch
'@reown/appkit-scaffold-utils-react-native': patch
'@reown/appkit-siwe-react-native': patch
'@reown/appkit-ui-react-native': patch
'@reown/appkit-wallet-react-native': patch
---

fix: solved issue with apple login on iOS
60 changes: 60 additions & 0 deletions .github/workflows/alpha-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Alpha Release

on:
workflow_dispatch:

permissions:
contents: read

jobs:
alpha-release:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout Repo
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Environment and Install Dependencies (Immutable)
uses: ./.github/actions/setup

- name: Configure Git User
run: |
git config user.name "GitHub Actions Bot"
git config user.email "github-actions[bot]@users.noreply.github.com"
shell: bash

- name: Enter Pre-mode
run: yarn changeset pre enter alpha
shell: bash

- name: Version Packages for Alpha
run: yarn changeset version
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Update Lockfile
run: yarn install --immutable false
shell: bash

- name: Build Packages
run: yarn changeset:prepublish
shell: bash

- name: Configure NPM for Publishing
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
shell: bash

- name: Publish Alpha to NPM
run: yarn changeset publish --tag alpha
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Push Changes and Tags
run: |
git push --follow-tags
shell: bash
9 changes: 7 additions & 2 deletions .github/workflows/changesets.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
name: Release
name: Changesets

permissions:
contents: read
pull-requests: write

on:
push:
branches: [main]
Expand All @@ -21,7 +26,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4

- name:
- name: Setup Environment
uses: ./.github/actions/setup

- name: Create Release Pull Request or Publish to NPM
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: E2E Tests

permissions:
contents: read

on:
workflow_dispatch:
workflow_call:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/expo-preview.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: expo-preview
name: Expo Preview

permissions:
contents: read

on:
workflow_call:
workflow_dispatch:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/expo-update.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: expo-update
name: Expo Update

permissions:
contents: read

on:
workflow_call:
workflow_dispatch:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: Pull Request

permissions:
contents: read

on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: Snapshot

permissions:
contents: read

on:
workflow_call:
workflow_dispatch:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
name: Verify

permissions:
contents: read

on:
workflow_call:
workflow_dispatch:
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/apps
.yarn
.yarn
.github/actions
8 changes: 3 additions & 5 deletions apps/native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"eas:build": "eas build --platform all",
"eas:build:local": "eas build --local --platform all",
"eas:update": "eas update --branch preview",
"playwright:test": "playwright test",
"playwright:test": "./scripts/replace-ep-test.sh && playwright test",
"playwright:install": "playwright install chromium",
"deploy": "gh-pages --nojekyll -d dist",
"build:web": "expo export -p web"
Expand All @@ -38,13 +38,11 @@
"react-native": "0.76.7",
"react-native-get-random-values": "~1.11.0",
"react-native-modal": "14.0.0-rc.0",
"react-native-svg": "15.8.0",
"react-native-svg": "15.12.0",
"react-native-toast-message": "2.2.1",
"react-native-web": "~0.19.13",
"react-native-webview": "13.12.5",
"uuid": "^11.1.0",
"viem": "2.23.10",
"wagmi": "2.14.13"
"uuid": "^11.1.0"
},
"devDependencies": {
"@babel/core": "^7.24.0",
Expand Down
5 changes: 5 additions & 0 deletions apps/native/scripts/replace-ep-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -e
cd "$(dirname "$0")"
cp ../../../node_modules/@walletconnect/ethereum-provider/dist/index.native.js ../../../node_modules/@walletconnect/ethereum-provider/dist/index.es.js
cp ../../../node_modules/@walletconnect/ethereum-provider/dist/index.native.js.map ../../../node_modules/@walletconnect/ethereum-provider/dist/index.es.js.map
4 changes: 2 additions & 2 deletions apps/native/tests/shared/pages/WalletPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ export class WalletPage {
timeout: 30000
});
await expect(btn).toBeEnabled();
await btn.focus();
await this.page.keyboard.press('Space');
await btn.click();
}

/**
Expand Down Expand Up @@ -115,6 +114,7 @@ export class WalletPage {
*/
async disconnectConnection() {
await this.page.waitForLoadState();
await this.page.waitForTimeout(1000);
const sessionsButton = this.page.getByTestId('sessions');
await sessionsButton.click();

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"build:gallery": "turbo run build:gallery",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
"prettier": "prettier --check .",
"test": "turbo run test --parallel",
"test": "turbo build && turbo run test --parallel",
"clean": "turbo clean && rm -rf node_modules && watchman watch-del-all",
"format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
"playwright:test": "cd apps/native && yarn playwright:test",
Expand Down
2 changes: 1 addition & 1 deletion packages/ethers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@reown/appkit-scaffold-react-native": "1.2.4",
"@reown/appkit-scaffold-utils-react-native": "1.2.4",
"@reown/appkit-siwe-react-native": "1.2.4",
"@walletconnect/ethereum-provider": "2.17.3"
"@walletconnect/ethereum-provider": "2.21.1"
},
"peerDependencies": {
"@react-native-async-storage/async-storage": ">=1.17.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/ethers/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,10 @@ export class AppKit extends AppKitScaffold {
}
}
} else {
await WalletConnectProvider.connect();
await WalletConnectProvider.connect({
chains: [],
optionalChains: [...this.chains.map(chain => chain.chainId)] as [number]
});
}

await this.setWalletConnectProvider();
Expand Down Expand Up @@ -552,6 +555,7 @@ export class AppKit extends AppKitScaffold {
projectId: this.projectId,
showQrModal: false,
rpcMap,
chains: [],
optionalChains: [...this.chains.map(chain => chain.chainId)] as [number],
metadata: this.metadata
};
Expand Down
2 changes: 1 addition & 1 deletion packages/ethers5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@reown/appkit-scaffold-react-native": "1.2.4",
"@reown/appkit-scaffold-utils-react-native": "1.2.4",
"@reown/appkit-siwe-react-native": "1.2.4",
"@walletconnect/ethereum-provider": "2.17.3"
"@walletconnect/ethereum-provider": "2.21.1"
},
"peerDependencies": {
"@react-native-async-storage/async-storage": ">=1.17.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/ethers5/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,10 @@ export class AppKit extends AppKitScaffold {
}
}
} else {
await WalletConnectProvider.connect();
await WalletConnectProvider.connect({
chains: [],
optionalChains: [...this.chains.map(chain => chain.chainId)] as [number]
});
}

await this.setWalletConnectProvider();
Expand Down Expand Up @@ -532,6 +535,7 @@ export class AppKit extends AppKitScaffold {
return map;
}, {})
: ({} as Record<number, string>),
chains: [],
optionalChains: [...this.chains.map(chain => chain.chainId)] as [number],
metadata: this.metadata
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useSnapshot } from 'valtio';
import { useCallback, useEffect, useState } from 'react';
import { Platform } from 'react-native';
import {
ConnectionController,
ConnectorController,
Expand Down Expand Up @@ -35,12 +34,9 @@ export function ConnectingSocialView() {
const { uri } = await provider.getSocialRedirectUri({
provider: ConnectionController.state.selectedSocialProvider
});
WebviewController.setWebviewUrl(uri);

const isNativeApple =
ConnectionController.state.selectedSocialProvider === 'apple' && Platform.OS === 'ios';

WebviewController.setWebviewVisible(!isNativeApple);
WebviewController.setWebviewUrl(uri);
WebviewController.setWebviewVisible(true);
WebviewController.setConnecting(true);
WebviewController.setConnectingProvider(ConnectionController.state.selectedSocialProvider);
}
Expand Down
3 changes: 3 additions & 0 deletions packages/wagmi/src/connectors/WalletConnectConnector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ export function walletConnect(parameters: WalletConnectParameters) {
const optionalChains = config.chains
.filter(chain => chain.id !== targetChainId)
.map(optionalChain => optionalChain.id);

await provider.connect({
chains: [],
optionalChains: [targetChainId, ...optionalChains],
...('pairingTopic' in rest ? { pairingTopic: rest.pairingTopic } : {})
});
Expand Down Expand Up @@ -255,6 +257,7 @@ export function walletConnect(parameters: WalletConnectParameters) {
const { projectId, metadata, ...params } = parameters;

return await EthereumProvider.init({
chains: [],
optionalChains,
projectId,
rpcMap: Object.fromEntries(
Expand Down
Loading