Merge pull request #179 from nightly-labs/selected-wallet

add current wallet getter to solana selector

sdk/apps/modal-example/package.json

@@ -22,14 +22,11 @@
     "@nightlylabs/nightly-connect-polkadot": "0.0.15",
     "@nightlylabs/nightly-connect-solana": "0.0.29",
     "@nightlylabs/nightly-connect-sui": "0.0.29",
-    "@nightlylabs/wallet-selector-aptos": "0.1.1",
-
-    "@nightlylabs/wallet-selector-base": "^0.4.0",
-
-    "@nightlylabs/wallet-selector-polkadot": "0.2.5",
-    "@nightlylabs/wallet-selector-solana": "0.3.1",
-    "@nightlylabs/wallet-selector-sui": "0.3.1",
-
+    "@nightlylabs/wallet-selector-aptos": "0.1.2",
+    "@nightlylabs/wallet-selector-base": "^0.4.1",
+    "@nightlylabs/wallet-selector-polkadot": "0.2.6",
+    "@nightlylabs/wallet-selector-solana": "0.3.2",
+    "@nightlylabs/wallet-selector-sui": "0.3.2",
     "@polkadot/api": "^10.10.1",
     "@polkadot/extension-inject": "^0.46.5",
     "@solana/web3.js": "^1.77.2",

sdk/packages/selector-aptos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/wallet-selector-aptos",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "",
   "type": "module",
   "exports": {
@@ -27,7 +27,7 @@
     "@aptos-labs/ts-sdk": "^1.9.1",
     "@aptos-labs/wallet-standard": "^0.0.11",
     "@nightlylabs/nightly-connect-aptos": "0.0.2",
-    "@nightlylabs/wallet-selector-base": "0.4.0",
+    "@nightlylabs/wallet-selector-base": "0.4.1",
     "@wallet-standard/core": "^1.0.3",
     "eventemitter3": "^5.0.1"
   },

sdk/packages/selector-aptos/src/adapter.ts

@@ -23,6 +23,7 @@ import {
   ConnectionType,
   defaultConnectionOptions,
   getRecentWalletForNetwork,
+  ISelectedWallet,
   isMobileBrowser,
   IWalletListItem,
   logoBase64,
@@ -69,6 +70,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
   private _detectionIntervalId: NodeJS.Timeout | undefined
   private _maxNumberOfChecks = 10
 
+  private _selectedWallet: ISelectedWallet | undefined = undefined
+
   get walletsList() {
     return this._walletsList
   }
@@ -80,6 +83,10 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     }
   }
 
+  get selectedWallet() {
+    return this._selectedWallet
+  }
+
   get sessionId() {
     return this._app?.sessionId
   }
@@ -180,6 +187,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           adapter.disconnect()
           return
         }
+        adapter.setSelectedWallet({ isRemote: true })
         adapter._accountInfo = accountInfo
         adapter._networkInfo = networkInfo
         adapter.connected = true
@@ -261,6 +269,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                 adapter.disconnect()
                 return
               }
+              adapter.setSelectedWallet({ isRemote: true })
               adapter._accountInfo = accountInfo
               adapter._networkInfo = networkInfo
               adapter.connected = true
@@ -350,6 +359,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                   const { accountInfo, networkInfo } = deserializeConnectData(
                     this._app.base.clientMetadata
                   )
+                  this.setSelectedWallet({ isRemote: true })
                   this._accountInfo = accountInfo
                   this._networkInfo = networkInfo
                   this.connected = true
@@ -405,7 +415,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                       this.disconnect()
                       return
                     }
-
+                    this.setSelectedWallet({ isRemote: true })
                     this._accountInfo = accountInfo
                     this._networkInfo = networkInfo
                     this.connected = true
@@ -529,6 +539,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           clearSessionIdForNetwork(APTOS_NETWORK)
           // Refresh app session
           this._app = await AppAptos.build(this._appInitData)
+          this._selectedWallet = undefined
 
           // Add event listener for userConnected
           this._app.on('userConnected', async (accountInfo, networkInfo) => {
@@ -545,6 +556,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                 this.disconnect()
                 return
               }
+              this.setSelectedWallet({ isRemote: true })
               this._accountInfo = accountInfo
               this._networkInfo = networkInfo
               this.connected = true
@@ -703,6 +715,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       }
 
       const wallet = this.walletsList.find((w) => w.name === walletName)
+      this.setSelectedWallet({ wallet })
 
       if (!this._app) {
         throw new Error('Wallet not ready')
@@ -769,6 +782,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       }
 
       const wallet = this.walletsList.find((w) => w.name === walletName)
+      this.setSelectedWallet({ wallet })
 
       if (typeof wallet?.standardWallet === 'undefined') {
         if (this._modal) {
@@ -856,4 +870,26 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       )
     }, 500)
   }
+
+  setSelectedWallet = ({
+    wallet,
+    isRemote = false
+  }: {
+    wallet?: IWalletListItem
+    isRemote?: boolean
+  }) => {
+    if (!wallet) {
+      // Connecting to the nightly mobile app
+      wallet = this.walletsList.find((wallet) => wallet.name === 'Nightly')
+    }
+
+    if (wallet) {
+      this._selectedWallet = {
+        name: wallet.name,
+        image: wallet.image,
+        homepage: wallet.homepage,
+        walletType: isRemote ? 'mobile' : wallet.walletType
+      }
+    }
+  }
 }

sdk/packages/selector-base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/wallet-selector-base",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "",
   "type": "module",
   "exports": {

sdk/packages/selector-base/src/types.ts

@@ -1,8 +1,9 @@
 import { type AppBaseInitialize } from '@nightlylabs/nightly-connect-base'
 import { type Deeplink } from '@nightlylabs/nightly-connect-base/dist/types/bindings/Deeplink'
 import { type Wallet } from '@wallet-standard/core'
-import { type WalletType } from '../../../bindings/WalletType'
+import { type Images } from '../../../bindings/Images'
 import { WalletMetadata } from '../../../bindings/WalletMetadata'
+import { type WalletType } from '../../../bindings/WalletType'
 export { type WalletMetadata } from '../../../bindings/WalletMetadata'
 
 export interface Adapter {
@@ -29,6 +30,13 @@ export interface IWalletListItem
   standardWallet?: Wallet
 }
 
+export interface ISelectedWallet {
+  name: string
+  homepage: string
+  walletType: WalletType
+  image: Images
+}
+
 export interface NetworkData {
   name: string
   icon: string

sdk/packages/selector-polkadot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/wallet-selector-polkadot",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "",
   "type": "module",
   "exports": {
@@ -25,7 +25,7 @@
   "license": "ISC",
   "dependencies": {
     "@nightlylabs/nightly-connect-polkadot": "^0.0.16",
-    "@nightlylabs/wallet-selector-base": "^0.4.0",
+    "@nightlylabs/wallet-selector-base": "^0.4.1",
     "@polkadot/api": "10.10.1",
     "@polkadot/extension-inject": "0.46.5",
     "@wallet-standard/core": "^1.0.3",

sdk/packages/selector-polkadot/src/adapter.ts

@@ -3,6 +3,7 @@ import { AppPolkadot, AppPolkadotInitialize } from '@nightlylabs/nightly-connect
 import {
   ConnectionOptions,
   ConnectionType,
+  ISelectedWallet,
   IWalletListItem,
   NightlyConnectSelectorModal,
   WalletMetadata,
@@ -20,9 +21,9 @@ import {
 
 import { type Signer as InjectedSigner } from '@polkadot/api/types'
 import { InjectedAccount, type Injected } from '@polkadot/extension-inject/types'
-import { IPolkadotWalletListItem, getPolkadotWalletsList } from './detection'
-import { networkToData, SupportedNetworks } from './utils'
 import EventEmitter from 'eventemitter3'
+import { IPolkadotWalletListItem, getPolkadotWalletsList } from './detection'
+import { SupportedNetworks, networkToData } from './utils'
 
 export type AppSelectorInitialize = Omit<AppPolkadotInitialize, 'network'> & {
   network: SupportedNetworks
@@ -58,6 +59,8 @@ export class NightlyConnectAdapter
 
   private _loading: boolean
 
+  private _selectedWallet: ISelectedWallet | undefined = undefined
+
   // interval used for checking for wallets with delayed detection
   private _detectionIntervalId: NodeJS.Timeout | undefined
   private _maxNumberOfChecks = 10
@@ -124,6 +127,10 @@ export class NightlyConnectAdapter
     return this._walletsList
   }
 
+  get selectedWallet() {
+    return this._selectedWallet
+  }
+
   set walletsList(list: IPolkadotWalletListItem[]) {
     this._walletsList = list
     if (this._modal) {
@@ -212,6 +219,7 @@ export class NightlyConnectAdapter
           adapter.disconnect()
           return
         }
+        adapter.setSelectedWallet({ isRemote: true })
         adapter._connected = true
         adapter.emit('connect', await adapter.accounts.get())
       } catch {
@@ -287,6 +295,7 @@ export class NightlyConnectAdapter
                 adapter.disconnect()
                 return
               }
+              adapter.setSelectedWallet({ isRemote: true })
               adapter._connected = true
               adapter.emit('connect', await adapter.accounts.get())
             } catch {
@@ -358,6 +367,7 @@ export class NightlyConnectAdapter
       }
 
       const wallet = this.walletsList.find((w) => w.name === walletName)
+      this.setSelectedWallet({ wallet })
 
       if (!this._app) {
         throw new Error('Wallet not ready')
@@ -434,7 +444,9 @@ export class NightlyConnectAdapter
       if (this._modal) {
         this._modal.setStandardWalletConnectProgress(true)
       }
-      const adapter = this.walletsList.find((w) => w.name === walletName)?.injectedWallet
+      const wallet = this.walletsList.find((w) => w.name === walletName)
+      const adapter = wallet?.injectedWallet
+      this.setSelectedWallet({ wallet })
       if (typeof adapter === 'undefined') {
         if (this._modal) {
           this._modal.setStandardWalletConnectProgress(false)
@@ -515,6 +527,7 @@ export class NightlyConnectAdapter
               if (this._app?.hasBeenRestored() && this._app.accounts.activeAccounts.length > 0) {
                 // Try to eager connect if session is restored
                 try {
+                  this.setSelectedWallet({ isRemote: true })
                   this._connected = true
                   this._connecting = false
                   this.emit('connect', await this.accounts.get())
@@ -561,6 +574,7 @@ export class NightlyConnectAdapter
                       this.disconnect()
                       return
                     }
+                    this.setSelectedWallet({ isRemote: true })
                     this._connected = true
                     this.emit('connect', await this.accounts.get())
                   } catch {
@@ -688,6 +702,28 @@ export class NightlyConnectAdapter
       clearRecentWalletForNetwork(this.network)
       this._innerStandardAdapter = undefined
       this._app = await AppPolkadot.build(this._appInitData)
+      this._selectedWallet = undefined
+
+      this._app.on('userConnected', async () => {
+        try {
+          persistRecentWalletForNetwork(this.network, {
+            walletName: this._chosenMobileWalletName || '',
+            walletType: ConnectionType.Nightly
+          })
+
+          if (!this._app || this._app.accounts.activeAccounts.length <= 0) {
+            this._connected = false
+            // If user does not pass any accounts, we should disconnect
+            this.disconnect()
+            return
+          }
+          this.setSelectedWallet({ isRemote: true })
+          this._connected = true
+          this.emit('connect', await this.accounts.get())
+        } catch {
+          this.disconnect()
+        }
+      })
 
       // Update recent wallet
       this.walletsList = getPolkadotWalletsList(
@@ -705,4 +741,26 @@ export class NightlyConnectAdapter
       clearInterval(this._detectionIntervalId)
     }
   }
+
+  setSelectedWallet = ({
+    wallet,
+    isRemote = false
+  }: {
+    wallet?: IWalletListItem
+    isRemote?: boolean
+  }) => {
+    if (!wallet) {
+      // Connecting to the nightly mobile app
+      wallet = this.walletsList.find((wallet) => wallet.name === 'Nightly')
+    }
+
+    if (wallet) {
+      this._selectedWallet = {
+        name: wallet.name,
+        image: wallet.image,
+        homepage: wallet.homepage,
+        walletType: isRemote ? 'mobile' : wallet.walletType
+      }
+    }
+  }
 }

sdk/packages/selector-solana/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/wallet-selector-solana",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "",
   "type": "module",
   "exports": {
@@ -25,7 +25,7 @@
   "license": "ISC",
   "dependencies": {
     "@nightlylabs/nightly-connect-solana": "^0.0.29",
-    "@nightlylabs/wallet-selector-base": "^0.4.0",
+    "@nightlylabs/wallet-selector-base": "^0.4.1",
     "@solana/wallet-adapter-base": "^0.9.22",
     "@solana/wallet-standard": "^1.0.2",
     "@solana/web3.js": "^1.77.2",