Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
68c9ab1
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 6, 2025
1a354ad
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 7, 2025
0db9fa2
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 7, 2025
c2c74bf
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 9, 2025
b4e4971
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 14, 2025
56fbe4a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 15, 2025
5d86d50
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 20, 2025
7baea76
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 21, 2025
eeaf5ed
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 22, 2025
1a5a1d0
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 23, 2025
b013ce6
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 26, 2025
fde6101
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 27, 2025
b25042b
merge
svenvoskamp May 30, 2025
56e5ba4
merge
svenvoskamp May 30, 2025
5b41e3d
merge
svenvoskamp Jun 2, 2025
a4b6118
merge
svenvoskamp Jun 3, 2025
68d55e0
merge
svenvoskamp Jun 4, 2025
66bbf81
merge
svenvoskamp Jun 4, 2025
4c9db2b
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 10, 2025
cd48517
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 12, 2025
0e4d5e9
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 13, 2025
4de1358
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 16, 2025
9cd447d
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 17, 2025
246db01
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 18, 2025
b80e6e4
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 18, 2025
8bf379c
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 19, 2025
decf027
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 19, 2025
a1f1405
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
313246e
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
5befd64
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
33d2ca8
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 23, 2025
ac46d2a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 27, 2025
730718e
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 30, 2025
18c9dd4
reduce auth switchConnection to be only called once
svenvoskamp Jun 30, 2025
0a9545d
Merge branch 'main' into fix/connectioncontroller-auth
svenvoskamp Jun 30, 2025
8e7ce38
fix tests
svenvoskamp Jun 30, 2025
0a04fb7
Merge branch 'fix/connectioncontroller-auth' of github.com:reown-com/…
svenvoskamp Jun 30, 2025
de6a59b
fix tests
svenvoskamp Jun 30, 2025
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
26 changes: 14 additions & 12 deletions packages/controllers/src/controllers/ConnectionController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -446,22 +446,24 @@ const controller = {
throw new Error(`No connector found for connection: ${connection.connectorId}`)
}

const connectData = await ConnectionController.connectExternal(
{
id: connector.id,
type: connector.type,
provider: connector.provider,
address,
chain: namespace
},
namespace
)
if (!isAuthConnector) {
const connectData = await ConnectionController.connectExternal(
{
id: connector.id,
type: connector.type,
provider: connector.provider,
address,
chain: namespace
},
namespace
)

if (isAuthConnector && address) {
return connectData?.address
} else if (isAuthConnector && address) {
await ConnectionController.handleAuthAccountSwitch({ address, namespace })
}

return connectData?.address
return address
},

async handleDisconnectedConnection({
Expand Down
4 changes: 4 additions & 0 deletions packages/controllers/src/utils/SIWXUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ export const SIWXUtil = {
}

try {
if (addEmbeddedWalletSessionPromise) {
await addEmbeddedWalletSessionPromise
}

const sessions = await siwx.getSessions(`${namespace}:${chainId}`, address)

if (sessions.length) {
Expand Down
Loading