Merge branch 'main' into changeset-release/main

reown-com · Jan 22, 2025 · bb740b1 · bb740b1
2 parents e9aac8b + a90474b
commit bb740b1
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 3 deletions.
diff --git a/.changeset/tasty-flies-call.md b/.changeset/tasty-flies-call.md
@@ -0,0 +1,23 @@
+---
+'@reown/appkit-adapter-solana': patch
+'@reown/appkit-adapter-wagmi': patch
+'@reown/appkit': patch
+'@reown/appkit-common': patch
+'@reown/appkit-adapter-bitcoin': patch
+'@reown/appkit-adapter-ethers': patch
+'@reown/appkit-adapter-ethers5': patch
+'@reown/appkit-utils': patch
+'@reown/appkit-cdn': patch
+'@reown/appkit-cli': patch
+'@reown/appkit-core': patch
+'@reown/appkit-experimental': patch
+'@reown/appkit-polyfills': patch
+'@reown/appkit-scaffold-ui': patch
+'@reown/appkit-siwe': patch
+'@reown/appkit-siwx': patch
+'@reown/appkit-ui': patch
+'@reown/appkit-wallet': patch
+'@reown/appkit-wallet-button': patch
+---
+
+Fixed an issue where multichain social/email login was not working
diff --git a/packages/adapters/solana/src/providers/AuthProvider.ts b/packages/adapters/solana/src/providers/AuthProvider.ts
@@ -18,7 +18,7 @@ import { ProviderEventEmitter } from './shared/ProviderEventEmitter.js'
 
 export class AuthProvider extends ProviderEventEmitter implements SolanaProvider {
   public readonly id = ConstantsUtil.CONNECTOR_ID.AUTH
-  public readonly name = ConstantsUtil.CONNECTOR_ID.AUTH
+  public readonly name = ConstantsUtil.CONNECTOR_NAMES.AUTH
   public readonly type = 'AUTH'
   public readonly chain = ConstantsUtil.CHAIN.SOLANA
   public readonly provider: W3mFrameProvider

diff --git a/packages/adapters/solana/src/tests/AuthProvider.test.ts b/packages/adapters/solana/src/tests/AuthProvider.test.ts
@@ -1,5 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { ConstantsUtil } from '@reown/appkit-common'
+
 import { AuthProvider } from '../providers/AuthProvider'
 import { mockLegacyTransaction, mockVersionedTransaction } from './mocks/Transaction'
 import { mockW3mFrameProvider } from './mocks/W3mFrameProvider'
@@ -24,6 +26,18 @@ describe('AuthProvider specific tests', () => {
     })
   })
 
+  it('should have correct metadata', () => {
+    expect(authProvider).toEqual(
+      expect.objectContaining({
+        id: ConstantsUtil.CONNECTOR_ID.AUTH,
+        name: ConstantsUtil.CONNECTOR_NAMES.AUTH,
+        type: 'AUTH',
+        chain: ConstantsUtil.CHAIN.SOLANA,
+        provider
+      })
+    )
+  })
+
   it('should call connect', async () => {
     await authProvider.connect()
 

diff --git a/packages/adapters/wagmi/src/connectors/AuthConnector.ts b/packages/adapters/wagmi/src/connectors/AuthConnector.ts
@@ -34,7 +34,7 @@ export function authConnector(parameters: AuthParameters) {
 
   return createConnector<W3mFrameProvider, Properties>(config => ({
     id: CommonConstantsUtil.CONNECTOR_ID.AUTH,
-    name: 'AppKit Auth',
+    name: CommonConstantsUtil.CONNECTOR_NAMES.AUTH,
     type: 'AUTH',
     chain: CommonConstantsUtil.CHAIN.EVM,
 

diff --git a/packages/appkit/src/adapters/ChainAdapterBlueprint.ts b/packages/appkit/src/adapters/ChainAdapterBlueprint.ts
@@ -105,7 +105,7 @@ export abstract class AdapterBlueprint<
     this.addConnector({
       id: CommonConstantsUtil.CONNECTOR_ID.AUTH,
       type: 'AUTH',
-      name: 'Auth',
+      name: CommonConstantsUtil.CONNECTOR_NAMES.AUTH,
       provider: authProvider,
       imageId: PresetsUtil.ConnectorImageIds[CommonConstantsUtil.CONNECTOR_ID.AUTH],
       chain: this.namespace,

diff --git a/packages/common/src/utils/ConstantsUtil.ts b/packages/common/src/utils/ConstantsUtil.ts
@@ -18,6 +18,9 @@ export const ConstantsUtil = {
     EIP6963: 'eip6963',
     AUTH: 'ID_AUTH'
   },
+  CONNECTOR_NAMES: {
+    AUTH: 'Auth'
+  },
   AUTH_CONNECTOR_SUPPORTED_CHAINS: ['eip155', 'solana'],
   LIMITS: {
     PENDING_TRANSACTIONS: 99