chore: remove intermediate select screen account

packages/core/src/controllers/RouterController.ts

@@ -17,7 +17,6 @@ export interface RouterControllerState {
   view:
     | 'Account'
     | 'AccountSettings'
-    | 'SelectAddresses'
     | 'AllWallets'
     | 'ApproveTransaction'
     | 'BuyInProgress'

packages/scaffold-ui/exports/index.ts

@@ -60,7 +60,6 @@ export * from '../src/views/w3m-connect-wallets-view/index.js'
 export * from '../src/views/w3m-connect-socials-view/index.js'
 export * from '../src/views/w3m-connecting-social-view/index.js'
 export * from '../src/views/w3m-profile-view/index.js'
-export * from '../src/views/w3m-select-addresses-view/index.js'
 export * from '../src/views/w3m-switch-address-view/index.js'
 export * from '../src/views/w3m-connecting-farcaster-view/index.js'
 

packages/scaffold-ui/src/modal/w3m-router/index.ts

@@ -101,8 +101,6 @@ export class W3mRouter extends LitElement {
         return html`<w3m-network-switch-view></w3m-network-switch-view>`
       case 'Profile':
         return html`<w3m-profile-view></w3m-profile-view>`
-      case 'SelectAddresses':
-        return html`<w3m-select-addresses-view></w3m-select-addresses-view>`
       case 'SwitchAddress':
         return html`<w3m-switch-address-view></w3m-switch-address-view>`
       case 'Transactions':

packages/scaffold-ui/src/partials/w3m-header/index.ts

@@ -52,7 +52,6 @@ function headings() {
     OnRampTokenSelect: 'Select Token',
     OnRampFiatSelect: 'Select Currency',
     Profile: undefined,
-    SelectAddresses: 'Select accounts',
     SwitchNetwork: networkName ?? 'Switch Network',
     SwitchAddress: 'Switch Address',
     Transactions: 'Activity',
@@ -212,7 +211,7 @@ export class W3mHeader extends LitElement {
       return html`<wui-select
         id="dynamic"
         data-testid="w3m-account-select-network"
-        active-network=${this.network?.name}
+        active-network=${ifDefined(this.network?.name)}
         @click=${this.onNetworks.bind(this)}
         imageSrc=${ifDefined(AssetUtil.getNetworkImage(this.network))}
       ></wui-select>`

packages/scaffold-ui/src/views/w3m-connecting-wc-view/index.ts

@@ -59,12 +59,7 @@ export class W3mConnectingWcView extends LitElement {
       if (retry || CoreHelperUtil.isPairingExpired(wcPairingExpiry)) {
         await ConnectionController.connectWalletConnect()
         this.finalizeConnection()
-        if (
-          StorageUtil.getConnectedConnector() === 'AUTH' &&
-          OptionsController.state.hasMultipleAddresses
-        ) {
-          RouterController.push('SelectAddresses')
-        } else if (OptionsController.state.isSiweEnabled) {
+        if (OptionsController.state.isSiweEnabled) {
           const { SIWEController } = await import('@web3modal/siwe')
           if (SIWEController.state.status === 'success') {
             ModalController.close()

packages/scaffold-ui/src/views/w3m-email-verify-otp-view/index.ts

@@ -1,39 +1,14 @@
 import { customElement } from '@web3modal/ui'
 import { W3mEmailOtpWidget } from '../../utils/w3m-email-otp-widget/index.js'
 import type { OnOtpSubmitFn, OnOtpResendFn } from '../../utils/w3m-email-otp-widget/index.js'
-import {
-  EventsController,
-  ConnectionController,
-  ModalController,
-  NetworkController,
-  RouterController,
-  AccountController
-} from '@web3modal/core'
-import { state } from 'lit/decorators.js'
+import { EventsController, ConnectionController, ModalController } from '@web3modal/core'
 
 @customElement('w3m-email-verify-otp-view')
 export class W3mEmailVerifyOtpView extends W3mEmailOtpWidget {
-  // -- Members ------------------------------------------- //
-  private unsubscribe: (() => void)[] = []
-
-  // -- State ------------------------------------------- //
-  @state() private smartAccountDeployed = AccountController.state.smartAccountDeployed
-
-  public constructor() {
-    super()
-
-    this.unsubscribe.push(
-      AccountController.subscribeKey('smartAccountDeployed', val => {
-        this.smartAccountDeployed = val
-      })
-    )
-  }
-
   // --  Private ------------------------------------------ //
   override onOtpSubmit: OnOtpSubmitFn = async otp => {
     try {
       if (this.authConnector) {
-        const smartAccountEnabled = NetworkController.checkIfSmartAccountEnabled()
         await this.authConnector.provider.connectOtp({ otp })
         EventsController.sendEvent({ type: 'track', event: 'EMAIL_VERIFICATION_CODE_PASS' })
         await ConnectionController.connectExternal(this.authConnector, this.authConnector.chain)
@@ -42,13 +17,7 @@ export class W3mEmailVerifyOtpView extends W3mEmailOtpWidget {
           event: 'CONNECT_SUCCESS',
           properties: { method: 'email', name: this.authConnector.name || 'Unknown' }
         })
-        if (AccountController.state.allAccounts.length > 1) {
-          RouterController.push('SelectAddresses')
-        } else if (smartAccountEnabled && !this.smartAccountDeployed) {
-          RouterController.push('UpgradeToSmartAccount')
-        } else {
-          ModalController.close()
-        }
+        ModalController.close()
       }
     } catch (error) {
       EventsController.sendEvent({ type: 'track', event: 'EMAIL_VERIFICATION_CODE_FAIL' })

packages/scaffold-ui/src/views/w3m-profile-view/index.ts

@@ -145,7 +145,7 @@ export class W3mProfileView extends LitElement {
         : html`<wui-button
             slot="action"
             textVariant="small-600"
-            size="sm"
+            size="md"
             variant="accent"
             @click=${() => this.onSwitchAccount(account)}
             >Switch</wui-button