From c96d9b222a4748532c843d067d0990d6d1d9986c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Florek?=
 <132075104+LukassF@users.noreply.github.com>
Date: Tue, 20 Aug 2024 13:21:16 +0200
Subject: [PATCH] Aptos refactor (#197)

* refactor-aptos

* aptos-refactor

* fix transactions

* remove logs

* fix code organisation

* fix connect
---
 sdk/apps/modal-example/package.json           |   2 +-
 sdk/apps/modal-example/src/routes/aptos.tsx   |  41 ++-
 .../modal-example/src/routes/aptosCustom.tsx  |  73 +++--
 sdk/packages/aptos/src/app.ts                 |   4 +-
 sdk/packages/selector-aptos/package.json      |   2 +-
 sdk/packages/selector-aptos/src/adapter.ts    | 306 ++++++++++--------
 sdk/pnpm-lock.yaml                            |   2 +-
 7 files changed, 248 insertions(+), 182 deletions(-)

diff --git a/sdk/apps/modal-example/package.json b/sdk/apps/modal-example/package.json
index 6e2c019f..f4b1e875 100644
--- a/sdk/apps/modal-example/package.json
+++ b/sdk/apps/modal-example/package.json
@@ -22,7 +22,7 @@
     "@nightlylabs/nightly-connect-polkadot": "0.0.16",
     "@nightlylabs/nightly-connect-solana": "0.0.29",
     "@nightlylabs/nightly-connect-sui": "0.1.0",
-    "@nightlylabs/wallet-selector-aptos": "0.1.6",
+    "@nightlylabs/wallet-selector-aptos": "0.1.7",
     "@nightlylabs/wallet-selector-base": "^0.4.1",
     "@nightlylabs/wallet-selector-polkadot": "0.2.7",
     "@nightlylabs/wallet-selector-solana": "0.3.6",
diff --git a/sdk/apps/modal-example/src/routes/aptos.tsx b/sdk/apps/modal-example/src/routes/aptos.tsx
index d9b45302..dcb618cc 100644
--- a/sdk/apps/modal-example/src/routes/aptos.tsx
+++ b/sdk/apps/modal-example/src/routes/aptos.tsx
@@ -2,15 +2,26 @@ import {
   AccountAuthenticator,
   AccountAuthenticatorEd25519,
   AnyRawTransaction,
-  Aptos
+  Aptos,
+  AccountPublicKey,
+  Network,
+  AptosConfig
 } from '@aptos-labs/ts-sdk'
-import { AccountInfo, AptosSignMessageInput, UserResponseStatus } from '@aptos-labs/wallet-standard'
+import {
+  AccountInfo,
+  AptosSignAndSubmitTransactionInput,
+  AptosSignMessageInput,
+  UserResponseStatus
+} from '@aptos-labs/wallet-standard'
 import { NightlyConnectAptosAdapter } from '@nightlylabs/wallet-selector-aptos'
 import { createEffect, createSignal, onMount, Show } from 'solid-js'
 import { Title } from '@solidjs/meta'
 import toast from 'solid-toast'
 
-const aptos = new Aptos() // default to devnet
+const aptosConfig = new AptosConfig({
+  network: Network.MAINNET
+})
+const aptos = new Aptos(aptosConfig)
 
 export default function AptosPage() {
   const [adapter, setAdapter] = createSignal<NightlyConnectAptosAdapter>()
@@ -35,7 +46,9 @@ export default function AptosPage() {
       })
 
       adapter.on('connect', (accInfo) => {
-        setAccountInfo(accInfo)
+        if (accInfo && 'address' in accInfo) {
+          setAccountInfo(accInfo)
+        }
       })
 
       adapter.on('disconnect', () => {
@@ -44,7 +57,9 @@ export default function AptosPage() {
       })
 
       adapter.on('accountChange', (accInfo) => {
-        setAccountInfo(accInfo)
+        if (accInfo && 'address' in accInfo) {
+          setAccountInfo(accInfo)
+        }
       })
 
       setAdapter(adapter)
@@ -70,7 +85,7 @@ export default function AptosPage() {
       <Title>Aptos Example</Title>
       <div id="modalAnchor" />
       <Show
-        when={!!accountInfo()}
+        when={!!accountInfo()?.address}
         fallback={
           <button
             onClick={() => {
@@ -88,12 +103,12 @@ export default function AptosPage() {
             Connect
           </button>
         }>
-        <h1>Current address: {accountInfo()?.address.toString()}</h1>
+        <h1>Current address: {accountInfo()?.address?.toString()}</h1>
         <button
           onClick={async () => {
             try {
               const transaction = await aptos.transaction.build.simple({
-                sender: accountInfo()!.address.toString(),
+                sender: accountInfo()!.address?.toString(),
                 data: {
                   function: '0x1::coin::transfer',
                   typeArguments: ['0x1::aptos_coin::AptosCoin'],
@@ -104,6 +119,7 @@ export default function AptosPage() {
                 }
               })
               const signedTx = await adapter()!.signAndSubmitTransaction(transaction)
+
               // Verify the transaction was signed
               if (signedTx.status !== UserResponseStatus.APPROVED) {
                 toast.error('Transaction was not approved')
@@ -122,7 +138,7 @@ export default function AptosPage() {
           onClick={async () => {
             try {
               const transaction = await aptos.transaction.build.simple({
-                sender: accountInfo()!.address.toString(),
+                sender: accountInfo()!.address?.toString(),
                 data: {
                   function: '0x1::coin::transfer',
                   typeArguments: ['0x1::aptos_coin::AptosCoin'],
@@ -173,8 +189,11 @@ export default function AptosPage() {
                 nonce: 'YOLO'
               }
               const signed = await adapter()!.signMessage(msgToSign)
-              if (signed.status !== UserResponseStatus.APPROVED) {
-                throw new Error('Message was not approved')
+              if ('signature' in signed) {
+                if (!signed.signature) throw new Error('Message was not approved')
+              } else {
+                if (signed.status !== UserResponseStatus.APPROVED)
+                  throw new Error('Message was not approved')
               }
               toast.success('Message was signed!')
             } catch (e) {
diff --git a/sdk/apps/modal-example/src/routes/aptosCustom.tsx b/sdk/apps/modal-example/src/routes/aptosCustom.tsx
index e964aafa..39b77249 100644
--- a/sdk/apps/modal-example/src/routes/aptosCustom.tsx
+++ b/sdk/apps/modal-example/src/routes/aptosCustom.tsx
@@ -1,11 +1,27 @@
-import { AccountAuthenticator, AccountAuthenticatorEd25519, Aptos } from '@aptos-labs/ts-sdk'
-import { AccountInfo, AptosSignMessageInput, UserResponseStatus } from '@aptos-labs/wallet-standard'
+import {
+  AccountAuthenticator,
+  AccountAuthenticatorEd25519,
+  AnyRawTransaction,
+  Aptos,
+  AccountPublicKey,
+  Network,
+  AptosConfig
+} from '@aptos-labs/ts-sdk'
+import {
+  AccountInfo,
+  AptosSignAndSubmitTransactionInput,
+  AptosSignMessageInput,
+  UserResponseStatus
+} from '@aptos-labs/wallet-standard'
 import { NightlyConnectAptosAdapter } from '@nightlylabs/wallet-selector-aptos'
 import { createEffect, createSignal, onMount, Show } from 'solid-js'
 import { Title } from '@solidjs/meta'
 import toast from 'solid-toast'
 
-const aptos = new Aptos() // default to devnet
+const aptosConfig = new AptosConfig({
+  network: Network.MAINNET
+})
+const aptos = new Aptos(aptosConfig)
 
 export default function AptosPage() {
   const [adapter, setAdapter] = createSignal<NightlyConnectAptosAdapter>()
@@ -30,19 +46,19 @@ export default function AptosPage() {
           '--nc-img-logo': 'url(https://alephzero.org/aleph-design/brand-elements/logo-day.svg)'
         },
         stylesOverride: `
-          .nc_headerWrapper {
-            background-color: blue;
-          }
-  
-          .nc_headerLogo {
-            width: 200px;
-          }
-  
-          .nc_modalContent {
-            border-radius: 0;
-            border: 3px dashed var(--nc-color-primary);
-          }
-          `,
+  .nc_headerWrapper {
+    background-color: blue;
+  }
+
+  .nc_headerLogo {
+    width: 200px;
+  }
+
+  .nc_modalContent {
+    border-radius: 0;
+    border: 3px dashed var(--nc-color-primary);
+  }
+  `,
         qrConfigOverride: {
           dotsOptions: {
             color: 'purple'
@@ -59,7 +75,9 @@ export default function AptosPage() {
       })
 
       adapter.on('connect', (accInfo) => {
-        setAccountInfo(accInfo)
+        if (accInfo && 'address' in accInfo) {
+          setAccountInfo(accInfo)
+        }
       })
 
       adapter.on('disconnect', () => {
@@ -68,7 +86,9 @@ export default function AptosPage() {
       })
 
       adapter.on('accountChange', (accInfo) => {
-        setAccountInfo(accInfo)
+        if (accInfo && 'address' in accInfo) {
+          setAccountInfo(accInfo)
+        }
       })
 
       setAdapter(adapter)
@@ -94,7 +114,7 @@ export default function AptosPage() {
       <Title>Aptos Example</Title>
       <div id="modalAnchor" />
       <Show
-        when={!!accountInfo()}
+        when={!!accountInfo()?.address}
         fallback={
           <button
             onClick={() => {
@@ -112,12 +132,12 @@ export default function AptosPage() {
             Connect
           </button>
         }>
-        <h1>Current address: {accountInfo()?.address.toString()}</h1>
+        <h1>Current address: {accountInfo()?.address?.toString()}</h1>
         <button
           onClick={async () => {
             try {
               const transaction = await aptos.transaction.build.simple({
-                sender: accountInfo()!.address.toString(),
+                sender: accountInfo()!.address?.toString(),
                 data: {
                   function: '0x1::coin::transfer',
                   typeArguments: ['0x1::aptos_coin::AptosCoin'],
@@ -128,6 +148,7 @@ export default function AptosPage() {
                 }
               })
               const signedTx = await adapter()!.signAndSubmitTransaction(transaction)
+
               // Verify the transaction was signed
               if (signedTx.status !== UserResponseStatus.APPROVED) {
                 toast.error('Transaction was not approved')
@@ -146,7 +167,7 @@ export default function AptosPage() {
           onClick={async () => {
             try {
               const transaction = await aptos.transaction.build.simple({
-                sender: accountInfo()!.address.toString(),
+                sender: accountInfo()!.address?.toString(),
                 data: {
                   function: '0x1::coin::transfer',
                   typeArguments: ['0x1::aptos_coin::AptosCoin'],
@@ -197,8 +218,12 @@ export default function AptosPage() {
                 nonce: 'YOLO'
               }
               const signed = await adapter()!.signMessage(msgToSign)
-              if (signed.status !== UserResponseStatus.APPROVED) {
-                throw new Error('Message was not approved')
+
+              if ('signature' in signed) {
+                if (!signed.signature) throw new Error('Message was not approved')
+              } else {
+                if (signed.status !== UserResponseStatus.APPROVED)
+                  throw new Error('Message was not approved')
               }
               toast.success('Message was signed!')
             } catch (e) {
diff --git a/sdk/packages/aptos/src/app.ts b/sdk/packages/aptos/src/app.ts
index b42e42e8..10e43fe2 100644
--- a/sdk/packages/aptos/src/app.ts
+++ b/sdk/packages/aptos/src/app.ts
@@ -15,6 +15,8 @@ import {
   TransactionToSign
 } from '@nightlylabs/nightly-connect-base'
 import { EventEmitter } from 'eventemitter3'
+import { UserDisconnectedEvent } from '../../../bindings/UserDisconnectedEvent'
+import { WalletMetadata } from '../../../bindings/WalletMetadata'
 import {
   AppAptosInitialize,
   APTOS_NETWORK,
@@ -25,8 +27,6 @@ import {
   serializeAptosTx,
   serializeObject
 } from './utils'
-import { UserDisconnectedEvent } from '../../../bindings/UserDisconnectedEvent'
-import { WalletMetadata } from '../../../bindings/WalletMetadata'
 
 interface AptosAppEvents {
   userConnected: (e: AccountInfo, networkInfo: NetworkInfo) => void
diff --git a/sdk/packages/selector-aptos/package.json b/sdk/packages/selector-aptos/package.json
index a0852f6d..d4e14737 100644
--- a/sdk/packages/selector-aptos/package.json
+++ b/sdk/packages/selector-aptos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/wallet-selector-aptos",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/sdk/packages/selector-aptos/src/adapter.ts b/sdk/packages/selector-aptos/src/adapter.ts
index 19656b6b..678b1964 100644
--- a/sdk/packages/selector-aptos/src/adapter.ts
+++ b/sdk/packages/selector-aptos/src/adapter.ts
@@ -51,17 +51,27 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
   // TODO: add later "implements WalletAdapter"
   name = 'Nightly Connect' as const
   icon = logoBase64
-  connected = false
-  connecting = false
-  // Nightly connect fields
+  // Remote app instance
   private _app: AppAptos | undefined
+  // Adapter for standard wallets
   private _innerStandardAdapter: AptosWallet | undefined
-  private _loading = false
+  // Remote app might be loading
+  private _appLoading: boolean
+  // Is wallet currently connecting
+  private _connecting: boolean
+  // Is wallet currently connected
+  private _connected: boolean
+  // Modal instance
   private _modal: NightlyConnectSelectorModal | undefined
+  // Init data for remote app
   private _appInitData: AppInitData
+  // List of wallets to display
   private _walletsList: IWalletListItem[] = []
+  // Name of the wallet to be displayed on mobile
   private _chosenMobileWalletName: string | undefined
+  // What type of connection is used
   private _connectionType: ConnectionType | undefined
+  // Wallets metadata
   private _metadataWallets: WalletMetadata[] = []
   private _connectionOptions: ConnectionOptions = defaultConnectionOptions
   // Data from NC connection
@@ -70,6 +80,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
 
   // interval used for checking for wallets with delayed detection
   private _detectionIntervalId: NodeJS.Timeout | undefined
+  // max number of tries to get delayed wallets
   private _maxNumberOfChecks = 10
 
   private _selectedWallet: ISelectedWallet | undefined = undefined
@@ -99,13 +110,14 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
 
   constructor(appInitData: AppInitData, connectionOptions?: ConnectionOptions) {
     super()
-    this.connecting = false
-    this.connected = false
+    this._connecting = false
+    this._connected = false
     this._appInitData = appInitData
     if (appInitData.persistent !== false) this._appInitData.persistent = true
-    this._loading = false
+    this._appLoading = false
     this._connectionOptions = { ...this._connectionOptions, ...connectionOptions }
 
+    // If not persistent, clear session id
     if (!this._appInitData.persistent) {
       clearSessionIdForNetwork(APTOS_NETWORK)
     }
@@ -187,7 +199,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
         })
 
         if (!adapter._app || adapter._app.connectedPublicKeys.length <= 0) {
-          adapter.connected = false
+          adapter._connected = false
           // If user does not pass any accounts, we should disconnect
           adapter.disconnect()
           return
@@ -195,7 +207,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
         adapter.setSelectedWallet({ isRemote: true })
         adapter._accountInfo = accountInfo
         adapter._networkInfo = networkInfo
-        adapter.connected = true
+        adapter._connected = true
+        adapter._connectionType = ConnectionType.Nightly
         adapter.emit('connect', accountInfo)
       } catch {
         adapter.disconnect()
@@ -250,12 +263,13 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       )
 
     if (!adapter._connectionOptions.initOnConnect) {
-      adapter._loading = true
+      adapter._appLoading = true
 
       NightlyConnectAptosAdapter.initApp(appInitData)
         .then(([app, metadataWallets]) => {
           adapter._app = app
           adapter._metadataWallets = metadataWallets
+          adapter._appLoading = false
 
           adapter.walletsList = getAptosWalletsList(
             metadataWallets,
@@ -272,7 +286,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
               })
 
               if (!adapter._app || adapter._app.connectedPublicKeys.length <= 0) {
-                adapter.connected = false
+                adapter._connected = false
                 // If user does not pass any accounts, we should disconnect
                 adapter.disconnect()
                 return
@@ -280,17 +294,15 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
               adapter.setSelectedWallet({ isRemote: true })
               adapter._accountInfo = accountInfo
               adapter._networkInfo = networkInfo
-              adapter.connected = true
+              adapter._connected = true
+              adapter._connectionType = ConnectionType.Nightly
               adapter.emit('connect', accountInfo)
             } catch {
               adapter.disconnect()
             }
           })
-
-          adapter._loading = false
         })
         .catch(() => {
-          adapter._loading = false
           throw new Error('Failed to initialize adapter')
         })
     }
@@ -308,7 +320,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     if (this._connectionType === ConnectionType.WalletStandard) {
       return await this._innerStandardAdapter!.features['aptos:network'].network()
     }
-    throw new Error('Should not reach here')
+    // Should not reach this point
+    throw new Error('Invalid connection type')
   }
 
   changeNetwork: AptosChangeNetworkMethod = async (networkInfo: NetworkInfo) => {
@@ -344,12 +357,12 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     return new Promise<ReturnType<AptosConnectMethod>>((resolve, reject) => {
       const innerConnect = async () => {
         try {
-          if (this.connecting) {
+          if (this._connecting) {
             reject('Cannot connect while connecting')
             return
           }
 
-          if (this.connected) {
+          if (this._connected) {
             // If we are connected, return the account
             const userInfo = {
               status: UserResponseStatus.APPROVED,
@@ -388,8 +401,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                   this.setSelectedWallet({ isRemote: true })
                   this._accountInfo = accountInfo
                   this._networkInfo = networkInfo
-                  this.connected = true
-                  this.connecting = false
+                  this._connected = true
+                  this._connecting = false
                   this._connectionType = ConnectionType.Nightly
                   this.emit('connect', this._accountInfo)
                   resolve(
@@ -415,11 +428,12 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           }
 
           if (this._connectionOptions.initOnConnect) {
-            this._loading = true
+            this._appLoading = true
             NightlyConnectAptosAdapter.initApp(this._appInitData)
               .then(([app, metadataWallets]) => {
                 this._app = app
                 this._metadataWallets = metadataWallets
+                this._appLoading = false
                 this.walletsList = getAptosWalletsList(
                   metadataWallets,
                   getRecentWalletForNetwork(APTOS_NETWORK)?.walletName ?? undefined
@@ -436,7 +450,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                     })
 
                     if (!this._app || this._app.connectedPublicKeys.length <= 0) {
-                      this.connected = false
+                      this._connected = false
                       // If user does not pass any accounts, we should disconnect
                       this.disconnect()
                       return
@@ -444,22 +458,22 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                     this.setSelectedWallet({ isRemote: true })
                     this._accountInfo = accountInfo
                     this._networkInfo = networkInfo
-                    this.connected = true
+                    this._connected = true
+                    this._connectionType = ConnectionType.Nightly
                     this.emit('connect', accountInfo)
                   } catch {
                     this.disconnect()
                   }
                 })
-                this._loading = false
               })
               .catch(() => {
-                this._loading = false
+                this._appLoading = false
                 throw new Error('Failed to initialize adapter')
               })
           }
 
           if (!this._modal) {
-            this.connecting = false
+            this._connecting = false
             const error = new Error('Wallet not ready')
             this.emit('error', error)
             reject(error)
@@ -467,10 +481,10 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           }
 
           // modal is defined here
-          this.connecting = true
+          this._connecting = true
           this._modal.onClose = () => {
-            if (this.connecting) {
-              this.connecting = false
+            if (this._connecting) {
+              this._connecting = false
               const error = new Error('Connection cancelled')
               this.emit('error', error)
               reject(error)
@@ -502,7 +516,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           // If modal is not opened, reject
           // This might be caused by SSR
           if (!opened) {
-            this.connecting = false
+            this._connecting = false
             const error = new Error('Failed to open modal')
             this.emit('error', error)
             reject(error)
@@ -521,10 +535,11 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
               this._app.on('userConnected', async (accountInfo, networkInfo) => {
                 try {
                   if (!this._app || this._app.connectedPublicKeys.length <= 0) {
+                    this._connected = false
                     reject(new Error('No accounts found'))
                   }
-                  this.connected = true
-                  this.connecting = false
+                  this._connected = true
+                  this._connecting = false
                   this._connectionType = ConnectionType.Nightly
                   this._modal?.closeModal()
                   this._accountInfo = accountInfo
@@ -536,7 +551,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
                 } catch (error) {
                   reject(error)
                 } finally {
-                  this.connecting = false
+                  this._connecting = false
                 }
               })
               return
@@ -549,7 +564,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
             }
           }, 10)
         } catch (error: unknown) {
-          this.connecting = false
+          this._connecting = false
           this.emit('error', error)
           reject(error)
         }
@@ -559,80 +574,83 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     })
   }
   disconnect = async () => {
-    if (this.connected) {
-      switch (this._connectionType) {
-        case ConnectionType.Nightly: {
-          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) => {
-            try {
-              persistRecentWalletForNetwork(APTOS_NETWORK, {
-                walletName: this._chosenMobileWalletName || '',
-                walletType: ConnectionType.Nightly
-              })
-
-              if (!this._app || this._app.connectedPublicKeys.length <= 0) {
-                this.connected = false
-
-                // If user does not pass any accounts, we should disconnect
-                this.disconnect()
-                return
-              }
-              this.setSelectedWallet({ isRemote: true })
-              this._accountInfo = accountInfo
-              this._networkInfo = networkInfo
-              this.connected = true
-              this.connecting = false
-              this.emit('connect', this._accountInfo)
-            } catch {
+    switch (this._connectionType) {
+      case ConnectionType.Nightly: {
+        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) => {
+          try {
+            persistRecentWalletForNetwork(APTOS_NETWORK, {
+              walletName: this._chosenMobileWalletName || '',
+              walletType: ConnectionType.Nightly
+            })
+
+            if (!this._app || this._app.connectedPublicKeys.length <= 0) {
+              this._connected = false
+              // If user does not pass any accounts, we should disconnect
               this.disconnect()
+              return
             }
-          })
-
-          break
-        }
-        case ConnectionType.WalletStandard: {
-          if (this._innerStandardAdapter) {
-            await this._innerStandardAdapter.features['aptos:disconnect'].disconnect()
-            clearRecentWalletForNetwork(APTOS_NETWORK)
-            this.walletsList = getAptosWalletsList(
-              this._metadataWallets,
-              getRecentWalletForNetwork(APTOS_NETWORK)?.walletName ?? undefined
-            )
+            this.setSelectedWallet({ isRemote: true })
+            this._accountInfo = accountInfo
+            this._networkInfo = networkInfo
+            this._connected = true
+            this._connecting = false
+            this._connectionType = ConnectionType.Nightly
+            this.emit('connect', this._accountInfo)
+          } catch {
+            this.disconnect()
           }
-          break
+        })
+
+        break
+      }
+      case ConnectionType.WalletStandard: {
+        if (this._innerStandardAdapter) {
+          await this._innerStandardAdapter.features['aptos:disconnect'].disconnect()
+          clearRecentWalletForNetwork(APTOS_NETWORK)
+          this.walletsList = getAptosWalletsList(
+            this._metadataWallets,
+            getRecentWalletForNetwork(APTOS_NETWORK)?.walletName ?? undefined
+          )
         }
+        break
       }
-      this._innerStandardAdapter = undefined
-      this._connectionType = undefined
-      this.connected = false
-      this.connecting = false
-      this.emit('disconnect')
     }
+    this._innerStandardAdapter = undefined
+    this._connectionType = undefined
+    this._connected = false
+    this._connecting = false
+    this.emit('disconnect')
+    clearInterval(this._detectionIntervalId)
   }
 
   signMessage: AptosSignMessageMethod = async (messageInput) => {
-    if (!this._app || !this._connectionType) {
-      const error = new Error('Wallet not ready')
-      this.emit('error', error)
-      throw error
-    }
-    switch (this._connectionType) {
-      case ConnectionType.Nightly: {
-        return await this._app.signMessage(messageInput)
+    try {
+      if (!this._connectionType) {
+        throw new Error('Wallet not ready')
       }
-      case ConnectionType.WalletStandard: {
-        if (!this._innerStandardAdapter) {
-          throw new Error('Wallet not ready')
+      switch (this._connectionType) {
+        case ConnectionType.Nightly: {
+          // App needs to be ready here
+          return await this._app!.signMessage(messageInput)
+        }
+        case ConnectionType.WalletStandard: {
+          if (!this._innerStandardAdapter) {
+            throw new Error('Wallet not ready')
+          }
+          return await this._innerStandardAdapter.features['aptos:signMessage'].signMessage(
+            messageInput
+          )
         }
-        return await this._innerStandardAdapter.features['aptos:signMessage'].signMessage(
-          messageInput
-        )
       }
+    } catch (error) {
+      this.emit('error', error)
+      throw error
     }
   }
 
@@ -640,48 +658,56 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     transaction: AnyRawTransaction,
     asFeePayer?: boolean
   ) => {
-    if (!this._app || !this._connectionType) {
-      const error = new Error('Wallet not ready')
-      this.emit('error', error)
-      throw error
-    }
-    switch (this._connectionType) {
-      case ConnectionType.Nightly: {
-        return await this._app.signTransaction(transaction, asFeePayer)
+    try {
+      if (!this._connectionType) {
+        throw new Error('Wallet not ready')
       }
-      case ConnectionType.WalletStandard: {
-        if (!this._innerStandardAdapter) {
-          throw new Error('Wallet not ready')
+      switch (this._connectionType) {
+        case ConnectionType.Nightly: {
+          // App needs to be ready here
+          return await this._app!.signTransaction(transaction, asFeePayer)
+        }
+        case ConnectionType.WalletStandard: {
+          if (!this._innerStandardAdapter) {
+            throw new Error('Wallet not ready')
+          }
+          return await this._innerStandardAdapter.features['aptos:signTransaction'].signTransaction(
+            transaction,
+            asFeePayer
+          )
         }
-        return await this._innerStandardAdapter.features['aptos:signTransaction'].signTransaction(
-          transaction,
-          asFeePayer
-        )
       }
+    } catch (error) {
+      this.emit('error', error)
+      throw error
     }
   }
 
   signAndSubmitTransaction: AptosSignAndSubmitTransactionMethod = async (transactionInput) => {
-    if (!this._app || !this._connectionType) {
-      const error = new Error('Wallet not ready')
-      this.emit('error', error)
-      throw error
-    }
-    switch (this._connectionType) {
-      case ConnectionType.Nightly: {
-        return await this._app.signAndSubmitTransaction(transactionInput)
+    try {
+      if (!this._connectionType) {
+        throw new Error('Wallet not ready')
       }
-      case ConnectionType.WalletStandard: {
-        if (!this._innerStandardAdapter) {
-          throw new Error('Wallet not ready')
+      switch (this._connectionType) {
+        case ConnectionType.Nightly: {
+          // App needs to be ready here
+          return await this._app!.signAndSubmitTransaction(transactionInput)
         }
-        if (!this._innerStandardAdapter.features['aptos:signAndSubmitTransaction']) {
-          throw new Error('Wallet does not support signAndSubmitTransaction')
+        case ConnectionType.WalletStandard: {
+          if (!this._innerStandardAdapter) {
+            throw new Error('Wallet not ready')
+          }
+          if (!this._innerStandardAdapter.features['aptos:signAndSubmitTransaction']) {
+            throw new Error('Wallet does not support signAndSubmitTransaction')
+          }
+          return await this._innerStandardAdapter.features[
+            'aptos:signAndSubmitTransaction'
+          ].signAndSubmitTransaction(transactionInput)
         }
-        return await this._innerStandardAdapter.features[
-          'aptos:signAndSubmitTransaction'
-        ].signAndSubmitTransaction(transactionInput)
       }
+    } catch (error) {
+      this.emit('error', error)
+      throw error
     }
   }
 
@@ -710,18 +736,18 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       }
 
       // Wait for app to be restored
-      if (this._loading) {
+      if (this._appLoading) {
         for (let i = 0; i < 200; i++) {
           await sleep(10)
 
-          if (!this._loading) {
+          if (!this._appLoading) {
             break
           }
         }
       }
 
-      if (this._loading) {
-        false
+      if (this._appLoading) {
+        return false
       }
 
       // If app is restored and has connected public keys, we can eager connect
@@ -822,8 +848,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
       const response = await adapter.features['aptos:connect'].connect(silent, networkInfo)
       if (response.status === UserResponseStatus.APPROVED) {
         this._innerStandardAdapter = adapter
-        this.connected = true
-        this.connecting = false
+        this._connected = true
+        this._connecting = false
         this._connectionType = ConnectionType.WalletStandard
         this.emit('connect', response.args)
         adapter.features['aptos:onAccountChange'].onAccountChange((a) => {
@@ -833,12 +859,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
           this.emit('networkChange', a)
         })
       } else {
-        if (this._modal) {
-          this._modal.setStandardWalletConnectProgress(false)
-        }
-        clearRecentWalletForNetwork(APTOS_NETWORK)
-        this.connecting = false
-        this.emit('error', new Error('User rejected connection'))
+        throw new Error('User rejected connection')
       }
       persistRecentWalletForNetwork(APTOS_NETWORK, {
         walletName,
@@ -847,12 +868,13 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
 
       this._modal?.closeModal()
       return response
-    } catch (err) {
+    } catch (err: any) {
       if (this._modal) {
         this._modal.setStandardWalletConnectProgress(false)
       }
       clearRecentWalletForNetwork(APTOS_NETWORK)
-      this.connecting = false
+      this._connecting = false
+      this.emit('error', err)
       throw err
     }
   }
@@ -886,7 +908,7 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     let checks = 0
 
     this._detectionIntervalId = setInterval(() => {
-      if (checks >= this._maxNumberOfChecks || this.connected) {
+      if (checks >= this._maxNumberOfChecks || this._connected) {
         clearInterval(this._detectionIntervalId)
       }
       checks++
diff --git a/sdk/pnpm-lock.yaml b/sdk/pnpm-lock.yaml
index a2ea9911..30ce0f6a 100644
--- a/sdk/pnpm-lock.yaml
+++ b/sdk/pnpm-lock.yaml
@@ -84,7 +84,7 @@ importers:
       '@nightlylabs/nightly-connect-polkadot': 0.0.16
       '@nightlylabs/nightly-connect-solana': 0.0.29
       '@nightlylabs/nightly-connect-sui': 0.1.0
-      '@nightlylabs/wallet-selector-aptos': 0.1.6
+      '@nightlylabs/wallet-selector-aptos': 0.1.7
       '@nightlylabs/wallet-selector-base': ^0.4.1
       '@nightlylabs/wallet-selector-polkadot': 0.2.7
       '@nightlylabs/wallet-selector-solana': 0.3.6