From 84ef3c6c1330991c23c94197cfeaa69f6ed13185 Mon Sep 17 00:00:00 2001
From: LukassF <szkulkerolf@gmail.com>
Date: Tue, 17 Sep 2024 16:10:13 +0200
Subject: [PATCH 1/3] add support change network mobile aptos

---
 sdk/packages/aptos/package.json            |  4 +-
 sdk/packages/aptos/src/app.ts              | 14 +++++
 sdk/packages/aptos/src/client.ts           | 41 ++++++++++----
 sdk/packages/aptos/src/utils.ts            | 25 +++++----
 sdk/packages/base/package.json             |  2 +-
 sdk/packages/base/src/app.ts               | 42 ++++++++++-----
 sdk/packages/base/src/client.ts            | 62 +++++++++++++++++-----
 sdk/packages/base/src/content.ts           | 16 +++++-
 sdk/packages/base/src/responseContent.ts   |  8 +++
 sdk/packages/selector-aptos/package.json   |  2 +-
 sdk/packages/selector-aptos/src/adapter.ts |  3 +-
 sdk/packages/selector-base/package.json    |  2 +-
 sdk/pnpm-lock.yaml                         | 12 ++---
 13 files changed, 175 insertions(+), 58 deletions(-)

diff --git a/sdk/packages/aptos/package.json b/sdk/packages/aptos/package.json
index d8dc8a8e..97528cc3 100644
--- a/sdk/packages/aptos/package.json
+++ b/sdk/packages/aptos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/nightly-connect-aptos",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "exports": {
     ".": {
@@ -45,7 +45,7 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "^1.9.1",
     "@aptos-labs/wallet-standard": "^0.0.11",
-    "@nightlylabs/nightly-connect-base": "^0.0.28",
+    "@nightlylabs/nightly-connect-base": "^0.0.29",
     "eventemitter3": "^5.0.1"
   }
 }
diff --git a/sdk/packages/aptos/src/app.ts b/sdk/packages/aptos/src/app.ts
index 10e43fe2..3153f012 100644
--- a/sdk/packages/aptos/src/app.ts
+++ b/sdk/packages/aptos/src/app.ts
@@ -1,5 +1,6 @@
 import {
   AccountInfo,
+  AptosChangeNetworkMethod,
   AptosSignAndSubmitTransactionMethod,
   AptosSignMessageMethod,
   AptosSignMessageOutput,
@@ -151,4 +152,17 @@ export class AppAptos extends EventEmitter<AptosAppEvents> {
       args: deserializeObject(signedTx[0].message) as AptosSignMessageOutput
     }
   }
+
+  changeNetwork: AptosChangeNetworkMethod = async (input) => {
+    const changedNetworkSuccess = await this.base.changeNetwork({
+      ...input,
+      name: input.name as string
+    })
+    return {
+      status: UserResponseStatus.APPROVED,
+      args: {
+        success: !!changedNetworkSuccess.newNetwork
+      }
+    }
+  }
 }
diff --git a/sdk/packages/aptos/src/client.ts b/sdk/packages/aptos/src/client.ts
index c7d12ab1..f04ec127 100644
--- a/sdk/packages/aptos/src/client.ts
+++ b/sdk/packages/aptos/src/client.ts
@@ -1,10 +1,19 @@
-import { AppDisconnectedEvent } from '../../../bindings/AppDisconnectedEvent'
+import { AnyRawTransaction } from '@aptos-labs/ts-sdk'
+import {
+  AccountInfo,
+  AptosSignAndSubmitTransactionOutput,
+  AptosSignMessageInput,
+  AptosSignMessageOutput,
+  AptosSignTransactionOutput,
+  NetworkInfo
+} from '@aptos-labs/wallet-standard'
 import {
   BaseClient,
   ClientBaseInitialize,
   Connect as ConnectBase
 } from '@nightlylabs/nightly-connect-base'
 import { EventEmitter } from 'eventemitter3'
+import { AppDisconnectedEvent } from '../../../bindings/AppDisconnectedEvent'
 import { GetInfoResponse } from '../../../bindings/GetInfoResponse'
 import { AptosRequest } from './requestTypes'
 import {
@@ -16,15 +25,6 @@ import {
   serializeObject,
   serializePendingTransactionResponse
 } from './utils'
-import { AnyRawTransaction } from '@aptos-labs/ts-sdk'
-import {
-  AccountInfo,
-  AptosSignAndSubmitTransactionOutput,
-  AptosSignMessageInput,
-  AptosSignMessageOutput,
-  AptosSignTransactionOutput,
-  NetworkInfo
-} from '@aptos-labs/wallet-standard'
 export interface SignAndSubmitTransactionEvent {
   sessionId: string
   requestId: string
@@ -136,6 +136,22 @@ export class ClientAptos extends EventEmitter<ClientAptosEvents> {
     return requests.map((request) => parseRequest(request, sessionIdToUse))
   }
 
+  public resolveChangeNetwork = async ({
+    requestId,
+    newNetwork,
+    sessionId
+  }: ResolveChangeNetwork) => {
+    const sessionIdToUse = sessionId || this.sessionId
+    if (sessionIdToUse === undefined) {
+      throw new Error('Session id is undefined')
+    }
+    await this.baseClient.resolveChangeNetwork({
+      requestId,
+      newNetwork,
+      sessionId: sessionIdToUse
+    })
+  }
+
   public resolveSignTransaction = async ({
     requestId,
     signedTransactions,
@@ -236,3 +252,8 @@ export interface ResolveSignAptosMessage {
   signedMessages: Array<AptosSignMessageOutput>
   sessionId?: string
 }
+export interface ResolveChangeNetwork {
+  requestId: string
+  newNetwork: NetworkInfo
+  sessionId?: string
+}
diff --git a/sdk/packages/aptos/src/utils.ts b/sdk/packages/aptos/src/utils.ts
index a1cb18ad..883c507d 100644
--- a/sdk/packages/aptos/src/utils.ts
+++ b/sdk/packages/aptos/src/utils.ts
@@ -1,22 +1,20 @@
-import { AppBaseInitialize, ContentType, RequestContent } from '@nightlylabs/nightly-connect-base'
-import {
-  AptosRequest,
-  CustomAptosRequest,
-  SignMessagesAptosRequest,
-  SignTransactionsAptosRequest
-} from './requestTypes'
 import {
   AccountAddress,
   AccountAuthenticator,
   AnyRawTransaction,
   Deserializer,
-  Ed25519PublicKey,
   PendingTransactionResponse,
-  PublicKey,
   RawTransaction,
   Serializer
 } from '@aptos-labs/ts-sdk'
 import { AccountInfo, NetworkInfo } from '@aptos-labs/wallet-standard'
+import { AppBaseInitialize, ContentType, RequestContent } from '@nightlylabs/nightly-connect-base'
+import {
+  AptosRequest,
+  CustomAptosRequest,
+  SignMessagesAptosRequest,
+  SignTransactionsAptosRequest
+} from './requestTypes'
 
 export type AppAptosInitialize = Omit<AppBaseInitialize, 'network'>
 
@@ -202,5 +200,14 @@ export const parseRequest = (request: RequestContent, sessionId: string): AptosR
       }
       return customRequest
     }
+    case ContentType.ChangeNetwork: {
+      const changeNetworkRequest: CustomAptosRequest = {
+        type: ContentType.Custom,
+        content: request.content.newNetwork.chainId.toString(),
+        requestId: request.requestId,
+        sessionId: sessionId
+      }
+      return changeNetworkRequest
+    }
   }
 }
diff --git a/sdk/packages/base/package.json b/sdk/packages/base/package.json
index df027426..91528079 100644
--- a/sdk/packages/base/package.json
+++ b/sdk/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nightlylabs/nightly-connect-base",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "type": "module",
   "exports": {
     ".": {
diff --git a/sdk/packages/base/src/app.ts b/sdk/packages/base/src/app.ts
index 99d74ddf..7bdfd586 100644
--- a/sdk/packages/base/src/app.ts
+++ b/sdk/packages/base/src/app.ts
@@ -1,20 +1,24 @@
+import { EventEmitter } from 'eventemitter3'
+import WebSocket from 'isomorphic-ws'
 import { AppToServer } from '../../../bindings/AppToServer'
 import { InitializeRequest } from '../../../bindings/InitializeRequest'
 import { InitializeResponse } from '../../../bindings/InitializeResponse'
+import { ResponsePayload } from '../../../bindings/ResponsePayload'
 import { ServerToApp } from '../../../bindings/ServerToApp'
 import { UserConnectedEvent } from '../../../bindings/UserConnectedEvent'
-import WebSocket from 'isomorphic-ws'
-import {
-  getLocalStorage,
-  getRandomId,
-  getSessionIdLocalStorageKey,
-  getWalletsMetadata
-} from './utils'
 import { UserDisconnectedEvent } from '../../../bindings/UserDisconnectedEvent'
-import { ContentType, MessageToSign, RequestInternal, TransactionToSign } from './content'
-import { ResponsePayload } from '../../../bindings/ResponsePayload'
 import { WalletMetadata } from '../../../bindings/WalletMetadata'
 import {
+  ChangeNetworkTo,
+  ContentType,
+  MessageToSign,
+  RequestInternal,
+  TransactionToSign
+} from './content'
+import { triggerDeeplink } from './deeplinks'
+import { AppBaseInitialize } from './initializeTypes'
+import {
+  ChangeNetworkResponseContent,
   CustomResponseContent,
   ResponseContent,
   ResponseContentType,
@@ -23,9 +27,12 @@ import {
   SignedMessage,
   SignedTransaction
 } from './responseContent'
-import { triggerDeeplink } from './deeplinks'
-import { EventEmitter } from 'eventemitter3'
-import { AppBaseInitialize } from './initializeTypes'
+import {
+  getLocalStorage,
+  getRandomId,
+  getSessionIdLocalStorageKey,
+  getWalletsMetadata
+} from './utils'
 
 interface BaseEvents {
   userConnected: (e: UserConnectedEvent) => void
@@ -202,6 +209,9 @@ export class BaseApp extends EventEmitter<BaseEvents> {
       case 'SignMessages': {
         return payload as SignMessagesResponseContent
       }
+      case 'ChangeNetwork': {
+        return payload as ChangeNetworkResponseContent
+      }
       case 'Custom': {
         return payload as CustomResponseContent
       }
@@ -222,6 +232,14 @@ export class BaseApp extends EventEmitter<BaseEvents> {
     })) as SignMessagesResponseContent
     return response.messages
   }
+
+  changeNetwork = async (newNetwork: ChangeNetworkTo) => {
+    const response = (await this.sendRequest({
+      type: ContentType.ChangeNetwork,
+      newNetwork: newNetwork
+    })) as ChangeNetworkResponseContent
+    return response
+  }
   customRequest = async (content: string): Promise<CustomResponseContent> => {
     const response = (await this.sendRequest({
       type: ContentType.Custom,
diff --git a/sdk/packages/base/src/client.ts b/sdk/packages/base/src/client.ts
index 3338b848..764918e8 100644
--- a/sdk/packages/base/src/client.ts
+++ b/sdk/packages/base/src/client.ts
@@ -1,27 +1,33 @@
 // import LocalStorage from 'isomorphic-localstorage'
-import { ClientToServer } from '../../../bindings/ClientToServer'
-import { ServerToClient } from '../../../bindings/ServerToClient'
+import { EventEmitter } from 'eventemitter3'
 import WebSocket from 'isomorphic-ws'
-import { getRandomId } from './utils'
-import { GetInfoRequest } from '../../../bindings/GetInfoRequest'
+import { AppDisconnectedEvent } from '../../../bindings/AppDisconnectedEvent'
+import { ClientInitializeRequest } from '../../../bindings/ClientInitializeRequest'
+import { ClientToServer } from '../../../bindings/ClientToServer'
 import { ConnectRequest } from '../../../bindings/ConnectRequest'
+import { DropSessionsRequest } from '../../../bindings/DropSessionsRequest'
+import { DropSessionsResponse } from '../../../bindings/DropSessionsResponse'
+import { GetInfoRequest } from '../../../bindings/GetInfoRequest'
 import { GetInfoResponse } from '../../../bindings/GetInfoResponse'
 import { GetPendingRequestsResponse } from '../../../bindings/GetPendingRequestsResponse'
-import { AppDisconnectedEvent } from '../../../bindings/AppDisconnectedEvent'
-import { EventEmitter } from 'eventemitter3'
-import { MessageToSign, RequestContent, RequestInternal, TransactionToSign } from './content'
+import { GetSessionsRequest } from '../../../bindings/GetSessionsRequest'
+import { GetSessionsResponse } from '../../../bindings/GetSessionsResponse'
+import { ServerToClient } from '../../../bindings/ServerToClient'
+import {
+  ChangeNetworkTo,
+  MessageToSign,
+  RequestContent,
+  RequestInternal,
+  TransactionToSign
+} from './content'
+import { ClientBaseInitialize } from './initializeTypes'
 import {
   ResponseContent,
   ResponseContentType,
   SignedMessage,
   SignedTransaction
 } from './responseContent'
-import { ClientInitializeRequest } from '../../../bindings/ClientInitializeRequest'
-import { GetSessionsRequest } from '../../../bindings/GetSessionsRequest'
-import { GetSessionsResponse } from '../../../bindings/GetSessionsResponse'
-import { DropSessionsRequest } from '../../../bindings/DropSessionsRequest'
-import { DropSessionsResponse } from '../../../bindings/DropSessionsResponse'
-import { ClientBaseInitialize } from './initializeTypes'
+import { getRandomId } from './utils'
 
 export interface SignTransactionsEvent {
   responseId: string
@@ -33,6 +39,11 @@ export interface SignMessagesEvent {
   sessionId: string
   messages: MessageToSign[]
 }
+export interface ChangeNetworkEvent {
+  responseId: string
+  sessionId: string
+  newNetwork: ChangeNetworkTo
+}
 export interface CustomEvent {
   responseId: string
   sessionId: string
@@ -40,6 +51,7 @@ export interface CustomEvent {
   content?: any
 }
 interface BaseEvents {
+  changeNetwork: (e: ChangeNetworkEvent) => void
   signTransactions: (e: SignTransactionsEvent) => void
   signMessages: (e: SignMessagesEvent) => void
   customEvent: (e: CustomEvent) => void
@@ -104,6 +116,14 @@ export class BaseClient extends EventEmitter<BaseEvents> {
                   })
                   break
                 }
+                case 'ChangeNetwork': {
+                  baseClient.emit('changeNetwork', {
+                    responseId: response.requestId,
+                    sessionId: response.sessionId,
+                    newNetwork: payload.newNetwork
+                  })
+                  break
+                }
                 case 'Custom': {
                   baseClient.emit('customEvent', {
                     responseId: response.requestId,
@@ -224,6 +244,16 @@ export class BaseClient extends EventEmitter<BaseEvents> {
       type: 'NewPayloadEventReply'
     })
   }
+  resolveChangeNetwork = async ({ requestId, sessionId, newNetwork }: ResolveChangeNetwork) => {
+    await this.resolveRequest({
+      requestId,
+      content: {
+        type: ResponseContentType.ChangedNetwork,
+        newNetwork: newNetwork
+      },
+      sessionId
+    })
+  }
   resolveSignTransactions = async ({
     requestId,
     sessionId,
@@ -274,6 +304,12 @@ export interface ResolveSignTransactions {
   sessionId: string
   signedTransactions: SignedTransaction[]
 }
+export interface ResolveChangeNetwork {
+  requestId: string
+  newNetwork: ChangeNetworkTo
+  sessionId: string
+}
+
 export interface ResolveSignMessages {
   requestId: string
   sessionId: string
diff --git a/sdk/packages/base/src/content.ts b/sdk/packages/base/src/content.ts
index b1cafa82..ceef9a0d 100644
--- a/sdk/packages/base/src/content.ts
+++ b/sdk/packages/base/src/content.ts
@@ -1,6 +1,7 @@
 export enum ContentType {
   SignMessages = 'SignMessages',
   SignTransactions = 'SignTransactions',
+  ChangeNetwork = 'ChangeNetwork',
   Custom = 'Custom'
 }
 
@@ -16,6 +17,15 @@ export interface TransactionToSign {
   transaction: string
   metadata?: string
 }
+export interface ChangeNetworkTo {
+  name: string
+  chainId: number
+  url?: string
+}
+export interface ChangeNetworkContent {
+  type: ContentType.ChangeNetwork
+  newNetwork: ChangeNetworkTo
+}
 export interface SignTransactionsContent {
   type: ContentType.SignTransactions
   transactions: TransactionToSign[]
@@ -24,7 +34,11 @@ export interface CustomContent {
   type: ContentType.Custom
   content?: string
 }
-export type RequestInternal = SignMessagesContent | SignTransactionsContent | CustomContent
+export type RequestInternal =
+  | SignMessagesContent
+  | SignTransactionsContent
+  | ChangeNetworkContent
+  | CustomContent
 export interface RequestContent {
   requestId: string
   content: RequestInternal
diff --git a/sdk/packages/base/src/responseContent.ts b/sdk/packages/base/src/responseContent.ts
index cc883bd2..d45c8e9f 100644
--- a/sdk/packages/base/src/responseContent.ts
+++ b/sdk/packages/base/src/responseContent.ts
@@ -1,6 +1,9 @@
+import { ChangeNetworkTo } from './content'
+
 export enum ResponseContentType {
   SignMessages = 'SignMessagesResponse',
   SignTransactions = 'SignTransactionsResponse',
+  ChangedNetwork = 'ChangedNetwork',
   Custom = 'CustomResponse',
   Reject = 'RejectResponse'
 }
@@ -21,6 +24,10 @@ export interface SignTransactionsResponseContent {
   type: ResponseContentType.SignTransactions
   transactions: SignedTransaction[]
 }
+export interface ChangeNetworkResponseContent {
+  type: ResponseContentType.ChangedNetwork
+  newNetwork: ChangeNetworkTo
+}
 export interface RejectResponseContent {
   type: ResponseContentType.Reject
   reason?: string
@@ -32,5 +39,6 @@ export interface CustomResponseContent {
 export type ResponseContent =
   | SignMessagesResponseContent
   | SignTransactionsResponseContent
+  | ChangeNetworkResponseContent
   | RejectResponseContent
   | CustomResponseContent
diff --git a/sdk/packages/selector-aptos/package.json b/sdk/packages/selector-aptos/package.json
index d4e14737..77e9c496 100644
--- a/sdk/packages/selector-aptos/package.json
+++ b/sdk/packages/selector-aptos/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "^1.9.1",
     "@aptos-labs/wallet-standard": "^0.0.11",
-    "@nightlylabs/nightly-connect-aptos": "0.0.2",
+    "@nightlylabs/nightly-connect-aptos": "0.0.3",
     "@nightlylabs/wallet-selector-base": "0.4.1",
     "@wallet-standard/core": "^1.0.3",
     "eventemitter3": "^5.0.1"
diff --git a/sdk/packages/selector-aptos/src/adapter.ts b/sdk/packages/selector-aptos/src/adapter.ts
index 678b1964..c5910d39 100644
--- a/sdk/packages/selector-aptos/src/adapter.ts
+++ b/sdk/packages/selector-aptos/src/adapter.ts
@@ -328,9 +328,8 @@ export class NightlyConnectAptosAdapter extends EventEmitter<AptosAdapterEvents>
     if (!this) {
       throw new Error('Not connected')
     }
-    // TODO: add support for Nightly Connect
     if (this._connectionType === ConnectionType.Nightly) {
-      throw new Error('Not supported for Nightly Connect')
+      return await this._app!.changeNetwork(networkInfo)
     }
     if (this._connectionType === ConnectionType.WalletStandard) {
       return await this._innerStandardAdapter!.features['aptos:changeNetwork']!.changeNetwork(
diff --git a/sdk/packages/selector-base/package.json b/sdk/packages/selector-base/package.json
index 9a18f593..f9865287 100644
--- a/sdk/packages/selector-base/package.json
+++ b/sdk/packages/selector-base/package.json
@@ -24,7 +24,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@nightlylabs/nightly-connect-base": "0.0.28",
+    "@nightlylabs/nightly-connect-base": "0.0.29",
     "@nightlylabs/wallet-selector-modal": "0.2.1",
     "@wallet-standard/core": "^1.0.3",
     "isomorphic-localstorage": "^1.0.2"
diff --git a/sdk/pnpm-lock.yaml b/sdk/pnpm-lock.yaml
index 30ce0f6a..3944ed11 100644
--- a/sdk/pnpm-lock.yaml
+++ b/sdk/pnpm-lock.yaml
@@ -173,7 +173,7 @@ importers:
     specifiers:
       '@aptos-labs/ts-sdk': ^1.9.1
       '@aptos-labs/wallet-standard': ^0.0.11
-      '@nightlylabs/nightly-connect-base': ^0.0.28
+      '@nightlylabs/nightly-connect-base': ^0.0.29
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.2.1
       '@rollup/plugin-terser': ^0.4.3
@@ -317,7 +317,7 @@ importers:
       tweetnacl: 1.0.3
       typescript: 5.5.3
     specifiers:
-      '@nightlylabs/nightly-connect-base': 0.0.28
+      '@nightlylabs/nightly-connect-base': 0.0.29
       '@polkadot/api': ^10.10.1
       '@polkadot/extension-inject': ^0.46.5
       '@polkadot/keyring': ^12.5.1
@@ -381,7 +381,7 @@ importers:
     specifiers:
       '@aptos-labs/ts-sdk': ^1.9.1
       '@aptos-labs/wallet-standard': ^0.0.11
-      '@nightlylabs/nightly-connect-aptos': 0.0.2
+      '@nightlylabs/nightly-connect-aptos': 0.0.3
       '@nightlylabs/wallet-selector-base': 0.4.1
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.1.0
@@ -409,7 +409,7 @@ importers:
       tslib: 2.6.3
       typescript: 5.5.3
     specifiers:
-      '@nightlylabs/nightly-connect-base': 0.0.28
+      '@nightlylabs/nightly-connect-base': 0.0.29
       '@nightlylabs/wallet-selector-modal': 0.2.1
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.1.0
@@ -546,7 +546,7 @@ importers:
       tweetnacl: 1.0.3
       typescript: 5.5.3
     specifiers:
-      '@nightlylabs/nightly-connect-base': 0.0.28
+      '@nightlylabs/nightly-connect-base': 0.0.29
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.1.0
       '@rollup/plugin-terser': ^0.4.3
@@ -589,7 +589,7 @@ importers:
     specifiers:
       '@mysten/sui': ^1.2.1
       '@mysten/wallet-standard': ^0.12.12
-      '@nightlylabs/nightly-connect-base': ^0.0.28
+      '@nightlylabs/nightly-connect-base': ^0.0.29
       '@noble/hashes': ^1.3.0
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.2.1

From fb0d43048a80fb7da22ff8a89faee43cc989fcbf Mon Sep 17 00:00:00 2001
From: LukassF <szkulkerolf@gmail.com>
Date: Tue, 17 Sep 2024 17:47:44 +0200
Subject: [PATCH 2/3] fix

---
 sdk/apps/modal-example/package.json         |  2 +-
 sdk/apps/modal-example/src/routes/aptos.tsx | 39 +++++++++++++++++
 sdk/packages/aptos/src/app.ts               |  5 +--
 sdk/packages/aptos/src/client.ts            | 17 +++++++-
 sdk/packages/aptos/src/e2e.test.ts          | 33 +++++++++------
 sdk/packages/aptos/src/http-client.test.ts  | 39 +++++++++++++----
 sdk/packages/aptos/src/http-client.ts       | 17 ++++++++
 sdk/packages/aptos/src/requestTypes.ts      |  9 +++-
 sdk/packages/aptos/src/utils.ts             |  2 +-
 sdk/packages/base/package.json              |  2 +
 sdk/packages/base/src/app.ts                | 11 ++---
 sdk/packages/base/src/client.test.ts        | 25 ++++++++++-
 sdk/packages/base/src/client.ts             | 13 ++----
 sdk/packages/base/src/content.ts            | 10 ++---
 sdk/packages/base/src/http-client.test.ts   | 30 ++++++++++++--
 sdk/packages/base/src/http-client.ts        | 46 ++++++++++++++++-----
 sdk/packages/base/src/responseContent.ts    |  4 +-
 sdk/packages/selector-aptos/package.json    |  2 +-
 sdk/pnpm-lock.yaml                          | 29 +++++++++----
 19 files changed, 259 insertions(+), 76 deletions(-)

diff --git a/sdk/apps/modal-example/package.json b/sdk/apps/modal-example/package.json
index f4b1e875..2f7293bf 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.7",
+    "@nightlylabs/wallet-selector-aptos": "0.1.8",
     "@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 dcb618cc..31f66719 100644
--- a/sdk/apps/modal-example/src/routes/aptos.tsx
+++ b/sdk/apps/modal-example/src/routes/aptos.tsx
@@ -27,6 +27,8 @@ export default function AptosPage() {
   const [adapter, setAdapter] = createSignal<NightlyConnectAptosAdapter>()
   const [eager, setEager] = createSignal(false)
   const [accountInfo, setAccountInfo] = createSignal<AccountInfo>()
+  const [currentNetwork, setCurrentNetwork] = createSignal<string>()
+
   onMount(async () => {
     NightlyConnectAptosAdapter.build(
       {
@@ -203,6 +205,43 @@ export default function AptosPage() {
           }}>
           Sign message
         </button>
+        <button
+          onClick={async () => {
+            try {
+              const network = await adapter()!.network()
+
+              let changeNetworkResponse
+              if (network.chainId === 27) {
+                // Movement network is active
+                changeNetworkResponse = await adapter()!.changeNetwork({
+                  chainId: 1,
+                  name: Network.MAINNET,
+                  url: 'https://fullnode.mainnet.aptoslabs.com/v1'
+                })
+              } else if ([1, 2, 147].includes(network.chainId)) {
+                // Aptos network is active (mainnet, devnet or testnet)
+                changeNetworkResponse = await adapter()!.changeNetwork({
+                  chainId: 27,
+                  name: Network.CUSTOM,
+                  url: 'https://aptos.testnet.suzuka.movementlabs.xyz/v1'
+                })
+              }
+
+              if (
+                changeNetworkResponse &&
+                changeNetworkResponse.status === UserResponseStatus.APPROVED
+              ) {
+                const changedNetwork = await adapter()!.network()
+                toast.success(`Changed network to ${currentNetwork}!`)
+                setCurrentNetwork(changedNetwork.chainId === 27 ? 'Aptos' : 'Movement')
+              }
+            } catch (error) {
+              toast.error("Couldn't change network")
+              console.log(error)
+            }
+          }}>
+          Change to {currentNetwork()}
+        </button>
         <button
           onClick={() => {
             adapter()?.disconnect()
diff --git a/sdk/packages/aptos/src/app.ts b/sdk/packages/aptos/src/app.ts
index 3153f012..389ffa9e 100644
--- a/sdk/packages/aptos/src/app.ts
+++ b/sdk/packages/aptos/src/app.ts
@@ -154,10 +154,7 @@ export class AppAptos extends EventEmitter<AptosAppEvents> {
   }
 
   changeNetwork: AptosChangeNetworkMethod = async (input) => {
-    const changedNetworkSuccess = await this.base.changeNetwork({
-      ...input,
-      name: input.name as string
-    })
+    const changedNetworkSuccess = await this.base.changeNetwork(input)
     return {
       status: UserResponseStatus.APPROVED,
       args: {
diff --git a/sdk/packages/aptos/src/client.ts b/sdk/packages/aptos/src/client.ts
index f04ec127..a95b1b1d 100644
--- a/sdk/packages/aptos/src/client.ts
+++ b/sdk/packages/aptos/src/client.ts
@@ -1,6 +1,7 @@
 import { AnyRawTransaction } from '@aptos-labs/ts-sdk'
 import {
   AccountInfo,
+  AptosChangeNetworkInput,
   AptosSignAndSubmitTransactionOutput,
   AptosSignMessageInput,
   AptosSignMessageOutput,
@@ -40,7 +41,13 @@ export interface SignMessagesEvent {
   sessionId: string
   messages: Array<AptosSignMessageInput>
 }
+interface ChangeNetworkEvent {
+  requestId: string
+  sessionId: string
+  newNetwork: AptosChangeNetworkInput
+}
 export interface ClientAptosEvents {
+  changeNetwork: (e: ChangeNetworkEvent) => void
   signAndSubmitTransaction: (e: SignAndSubmitTransactionEvent) => void
   signTransaction: (e: SignTransactionEvent) => void
   signMessage: (e: SignMessagesEvent) => void
@@ -82,6 +89,14 @@ export class ClientAptos extends EventEmitter<ClientAptosEvents> {
       }
       this.emit('signMessage', event)
     })
+    baseClient.on('changeNetwork', (e) => {
+      const event: ChangeNetworkEvent = {
+        sessionId: e.sessionId,
+        requestId: e.responseId,
+        newNetwork: e.newNetwork
+      }
+      this.emit('changeNetwork', event)
+    })
     baseClient.on('appDisconnected', (e) => {
       this.emit('appDisconnected', e)
     })
@@ -254,6 +269,6 @@ export interface ResolveSignAptosMessage {
 }
 export interface ResolveChangeNetwork {
   requestId: string
-  newNetwork: NetworkInfo
+  newNetwork: AptosChangeNetworkInput
   sessionId?: string
 }
diff --git a/sdk/packages/aptos/src/e2e.test.ts b/sdk/packages/aptos/src/e2e.test.ts
index dcdd987f..e0d01a0d 100644
--- a/sdk/packages/aptos/src/e2e.test.ts
+++ b/sdk/packages/aptos/src/e2e.test.ts
@@ -8,6 +8,7 @@ import { APTOS_NETWORK } from './utils'
 import { Account, Aptos, Ed25519PrivateKey, Network } from '@aptos-labs/ts-sdk'
 import {
   AccountInfo,
+  AptosChangeNetworkInput,
   AptosSignMessageInput,
   NetworkInfo,
   UserResponseStatus
@@ -99,9 +100,7 @@ describe('Aptos client tests', () => {
       }
     })
 
-    const signedTx = await app.signTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
+    const signedTx = await app.signTransaction(transaction)
     // Verify the transaction was signed
     if (signedTx.status !== UserResponseStatus.APPROVED) {
       throw new Error('Transaction was not approved')
@@ -140,6 +139,22 @@ describe('Aptos client tests', () => {
     await smartDelay()
     const _signedMessage = await app.signMessage(msgToSign)
   })
+  test('#on("changeNetwork")', async () => {
+    client.on('changeNetwork', async (e) => {
+      const payload = e.newNetwork
+      await client.resolveChangeNetwork({
+        requestId: e.requestId,
+        newNetwork: payload
+      })
+    })
+
+    await smartDelay()
+    const newNetwork: AptosChangeNetworkInput = {
+      name: Network.MAINNET,
+      chainId: 27
+    }
+    const _changedNetwork = await app.changeNetwork(newNetwork)
+  })
   test('#on("signAndSubmitTransaction")', async () => {
     const bobAddress = '0xb0b'
 
@@ -172,9 +187,7 @@ describe('Aptos client tests', () => {
       }
     })
 
-    const submittedTx = await app.signAndSubmitTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
+    const submittedTx = await app.signAndSubmitTransaction(transaction)
     // Verify the transaction was signed
     if (submittedTx.status !== UserResponseStatus.APPROVED) {
       throw new Error('Transaction was not approved')
@@ -193,12 +206,8 @@ describe('Aptos client tests', () => {
         functionArguments: [bobAddress, 100]
       }
     })
-    app.signAndSubmitTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
-    app.signAndSubmitTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
+    app.signAndSubmitTransaction(transaction)
+    app.signAndSubmitTransaction(transaction)
     await smartDelay(500)
     const requests = await client.getPendingRequests()
     expect(requests.length).toBe(2)
diff --git a/sdk/packages/aptos/src/http-client.test.ts b/sdk/packages/aptos/src/http-client.test.ts
index 27d81822..b52bc966 100644
--- a/sdk/packages/aptos/src/http-client.test.ts
+++ b/sdk/packages/aptos/src/http-client.test.ts
@@ -1,6 +1,7 @@
 import { Account, Aptos, Ed25519PrivateKey, Network } from '@aptos-labs/ts-sdk'
 import {
   AccountInfo,
+  AptosChangeNetworkInput,
   AptosSignMessageInput,
   NetworkInfo,
   UserResponseStatus
@@ -10,7 +11,11 @@ import { assert, beforeAll, beforeEach, describe, expect, test, vi } from 'vites
 import { TEST_RELAY_ENDPOINT, smartDelay } from '../../../commonTestUtils'
 import { AppAptos } from './app'
 import { HttpClientAptos } from './http-client'
-import { SignMessagesAptosRequest, SignTransactionsAptosRequest } from './requestTypes'
+import {
+  ChangeNetworkAptosRequest,
+  SignMessagesAptosRequest,
+  SignTransactionsAptosRequest
+} from './requestTypes'
 import { TEST_APP_INITIALIZE } from './testUtils'
 import { APTOS_NETWORK, serializeConnectData } from './utils'
 // Edit an assertion and save to see HMR in action
@@ -78,9 +83,7 @@ describe('Aptos http-client tests', () => {
         functionArguments: [bobAddress, 100]
       }
     })
-    const promiseSignTransaction = app.signTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
+    const promiseSignTransaction = app.signTransaction(transaction)
     await smartDelay()
     // Query for request
     const pendingRequest = (
@@ -123,9 +126,7 @@ describe('Aptos http-client tests', () => {
         functionArguments: [bobAddress, 100]
       }
     })
-    const promiseSignTransaction = app.signAndSubmitTransaction({
-      rawTransaction: transaction.rawTransaction
-    })
+    const promiseSignTransaction = app.signAndSubmitTransaction(transaction)
     await smartDelay()
     // Query for request
     const pendingRequest = (
@@ -190,4 +191,28 @@ describe('Aptos http-client tests', () => {
       throw new Error('Transaction was not approved')
     }
   })
+  test('#resolveChangeNetwork()', async () => {
+    const newNetwork: AptosChangeNetworkInput = {
+      name: Network.MAINNET,
+      chainId: 27
+    }
+
+    const _changedNetwork = app.changeNetwork(newNetwork)
+    await smartDelay()
+
+    const pendingRequest = (
+      await client.getPendingRequests({ sessionId: app.sessionId })
+    )[0] as ChangeNetworkAptosRequest
+    expect(pendingRequest.type).toBe(ContentType.ChangeNetwork)
+    expect(pendingRequest.newNetwork.chainId).toBe(27)
+    expect(pendingRequest.newNetwork.name).toBe(Network.MAINNET)
+
+    const payload = pendingRequest.newNetwork
+
+    await client.resolveChangeNetwork({
+      requestId: pendingRequest.requestId,
+      sessionId: app.sessionId,
+      newNetwork: payload
+    })
+  })
 })
diff --git a/sdk/packages/aptos/src/http-client.ts b/sdk/packages/aptos/src/http-client.ts
index cb554811..8c7ebbf0 100644
--- a/sdk/packages/aptos/src/http-client.ts
+++ b/sdk/packages/aptos/src/http-client.ts
@@ -1,4 +1,5 @@
 import {
+  AptosChangeNetworkInput,
   AptosSignAndSubmitTransactionOutput,
   AptosSignMessageOutput,
   AptosSignTransactionOutput
@@ -69,6 +70,17 @@ export class HttpClientAptos {
       sessionId: sessionId
     })
   }
+  public resolveChangeNetwork = async ({
+    requestId,
+    newNetwork,
+    sessionId
+  }: ResolveChangeNetwork) => {
+    await this.baseClient.resolveChangeNetwork({
+      requestId,
+      newNetwork,
+      sessionId: sessionId ?? ''
+    })
+  }
   public resolveSignMessage = async ({
     requestId,
     signedMessages,
@@ -110,3 +122,8 @@ export interface ResolveSignAndSubmitTransactions {
   signedTransactions: Array<AptosSignAndSubmitTransactionOutput>
   sessionId: string
 }
+export interface ResolveChangeNetwork {
+  requestId: string
+  newNetwork: AptosChangeNetworkInput
+  sessionId?: string
+}
diff --git a/sdk/packages/aptos/src/requestTypes.ts b/sdk/packages/aptos/src/requestTypes.ts
index 3c6c4a0b..c669d271 100644
--- a/sdk/packages/aptos/src/requestTypes.ts
+++ b/sdk/packages/aptos/src/requestTypes.ts
@@ -1,5 +1,5 @@
 import { AnyRawTransaction } from '@aptos-labs/ts-sdk'
-import { AptosSignMessageInput } from '@aptos-labs/wallet-standard'
+import { AptosChangeNetworkInput, AptosSignMessageInput } from '@aptos-labs/wallet-standard'
 import { ContentType } from '@nightlylabs/nightly-connect-base'
 
 export interface SignTransactionsAptosRequest {
@@ -15,6 +15,12 @@ export interface SignMessagesAptosRequest {
   messages: Array<AptosSignMessageInput>
   sessionId: string
 }
+export interface ChangeNetworkAptosRequest {
+  type: ContentType.ChangeNetwork
+  requestId: string
+  newNetwork: AptosChangeNetworkInput
+  sessionId: string
+}
 export interface CustomAptosRequest {
   type: ContentType.Custom
   requestId: string
@@ -24,4 +30,5 @@ export interface CustomAptosRequest {
 export type AptosRequest =
   | SignTransactionsAptosRequest
   | SignMessagesAptosRequest
+  | ChangeNetworkAptosRequest
   | CustomAptosRequest
diff --git a/sdk/packages/aptos/src/utils.ts b/sdk/packages/aptos/src/utils.ts
index 883c507d..c5a1c8dc 100644
--- a/sdk/packages/aptos/src/utils.ts
+++ b/sdk/packages/aptos/src/utils.ts
@@ -203,7 +203,7 @@ export const parseRequest = (request: RequestContent, sessionId: string): AptosR
     case ContentType.ChangeNetwork: {
       const changeNetworkRequest: CustomAptosRequest = {
         type: ContentType.Custom,
-        content: request.content.newNetwork.chainId.toString(),
+        content: JSON.stringify(request.content),
         requestId: request.requestId,
         sessionId: sessionId
       }
diff --git a/sdk/packages/base/package.json b/sdk/packages/base/package.json
index 91528079..dab6ad32 100644
--- a/sdk/packages/base/package.json
+++ b/sdk/packages/base/package.json
@@ -45,6 +45,8 @@
     "cross-fetch": "^3.1.6",
     "eventemitter3": "^5.0.1",
     "isomorphic-localstorage": "^1.0.2",
+    "@aptos-labs/wallet-standard": "^0.0.11",
+    "@aptos-labs/ts-sdk": "^1.9.1",
     "isomorphic-ws": "^5.0.0",
     "uuid": "^9.0.0",
     "ws": "^8.13.0"
diff --git a/sdk/packages/base/src/app.ts b/sdk/packages/base/src/app.ts
index 7bdfd586..03257ff1 100644
--- a/sdk/packages/base/src/app.ts
+++ b/sdk/packages/base/src/app.ts
@@ -1,3 +1,4 @@
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
 import { EventEmitter } from 'eventemitter3'
 import WebSocket from 'isomorphic-ws'
 import { AppToServer } from '../../../bindings/AppToServer'
@@ -8,13 +9,7 @@ import { ServerToApp } from '../../../bindings/ServerToApp'
 import { UserConnectedEvent } from '../../../bindings/UserConnectedEvent'
 import { UserDisconnectedEvent } from '../../../bindings/UserDisconnectedEvent'
 import { WalletMetadata } from '../../../bindings/WalletMetadata'
-import {
-  ChangeNetworkTo,
-  ContentType,
-  MessageToSign,
-  RequestInternal,
-  TransactionToSign
-} from './content'
+import { ContentType, MessageToSign, RequestInternal, TransactionToSign } from './content'
 import { triggerDeeplink } from './deeplinks'
 import { AppBaseInitialize } from './initializeTypes'
 import {
@@ -233,7 +228,7 @@ export class BaseApp extends EventEmitter<BaseEvents> {
     return response.messages
   }
 
-  changeNetwork = async (newNetwork: ChangeNetworkTo) => {
+  changeNetwork = async (newNetwork: AptosChangeNetworkInput) => {
     const response = (await this.sendRequest({
       type: ContentType.ChangeNetwork,
       newNetwork: newNetwork
diff --git a/sdk/packages/base/src/client.test.ts b/sdk/packages/base/src/client.test.ts
index 51cee8ab..9e76dbc4 100644
--- a/sdk/packages/base/src/client.test.ts
+++ b/sdk/packages/base/src/client.test.ts
@@ -1,10 +1,12 @@
+import { Network } from '@aptos-labs/ts-sdk'
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
 import { assert, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest'
-import { BaseApp } from './app'
-import { testAppBaseInitialize, testClientBaseInitialize } from './testUtils'
 import { smartDelay } from '../../../commonTestUtils'
+import { BaseApp } from './app'
 import { BaseClient, Connect } from './client'
 import { ContentType, MessageToSign, TransactionToSign } from './content'
 import { SignedMessage, SignedTransaction } from './responseContent'
+import { testAppBaseInitialize, testClientBaseInitialize } from './testUtils'
 
 // Edit an assertion and save to see HMR in action
 
@@ -78,6 +80,25 @@ describe('Base Client tests', () => {
 
     assert(signed.length === 2)
   })
+  test('#on("changeNetwork")', async () => {
+    const randomNewNetwork: AptosChangeNetworkInput = {
+      name: Network.MAINNET,
+      chainId: 27
+    }
+    client.on('changeNetwork', async (e) => {
+      assert(e.newNetwork.chainId === 27)
+      // resolve
+      await client.resolveChangeNetwork({
+        sessionId: e.sessionId,
+        requestId: e.responseId,
+        newNetwork: randomNewNetwork
+      })
+    })
+    await smartDelay()
+    const newNetwork = await baseApp.changeNetwork(randomNewNetwork)
+
+    assert(newNetwork.newNetwork.chainId === 27)
+  })
   test('#getPendingRequests', async () => {
     const randomSignMessage: MessageToSign[] = [{ message: '1' }, { message: '13' }]
     baseApp.signMessages(randomSignMessage)
diff --git a/sdk/packages/base/src/client.ts b/sdk/packages/base/src/client.ts
index 764918e8..8e6a6124 100644
--- a/sdk/packages/base/src/client.ts
+++ b/sdk/packages/base/src/client.ts
@@ -1,4 +1,5 @@
 // import LocalStorage from 'isomorphic-localstorage'
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
 import { EventEmitter } from 'eventemitter3'
 import WebSocket from 'isomorphic-ws'
 import { AppDisconnectedEvent } from '../../../bindings/AppDisconnectedEvent'
@@ -13,13 +14,7 @@ import { GetPendingRequestsResponse } from '../../../bindings/GetPendingRequests
 import { GetSessionsRequest } from '../../../bindings/GetSessionsRequest'
 import { GetSessionsResponse } from '../../../bindings/GetSessionsResponse'
 import { ServerToClient } from '../../../bindings/ServerToClient'
-import {
-  ChangeNetworkTo,
-  MessageToSign,
-  RequestContent,
-  RequestInternal,
-  TransactionToSign
-} from './content'
+import { MessageToSign, RequestContent, RequestInternal, TransactionToSign } from './content'
 import { ClientBaseInitialize } from './initializeTypes'
 import {
   ResponseContent,
@@ -42,7 +37,7 @@ export interface SignMessagesEvent {
 export interface ChangeNetworkEvent {
   responseId: string
   sessionId: string
-  newNetwork: ChangeNetworkTo
+  newNetwork: AptosChangeNetworkInput
 }
 export interface CustomEvent {
   responseId: string
@@ -306,7 +301,7 @@ export interface ResolveSignTransactions {
 }
 export interface ResolveChangeNetwork {
   requestId: string
-  newNetwork: ChangeNetworkTo
+  newNetwork: AptosChangeNetworkInput
   sessionId: string
 }
 
diff --git a/sdk/packages/base/src/content.ts b/sdk/packages/base/src/content.ts
index ceef9a0d..cd7a7407 100644
--- a/sdk/packages/base/src/content.ts
+++ b/sdk/packages/base/src/content.ts
@@ -1,3 +1,5 @@
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
+
 export enum ContentType {
   SignMessages = 'SignMessages',
   SignTransactions = 'SignTransactions',
@@ -17,14 +19,10 @@ export interface TransactionToSign {
   transaction: string
   metadata?: string
 }
-export interface ChangeNetworkTo {
-  name: string
-  chainId: number
-  url?: string
-}
+
 export interface ChangeNetworkContent {
   type: ContentType.ChangeNetwork
-  newNetwork: ChangeNetworkTo
+  newNetwork: AptosChangeNetworkInput
 }
 export interface SignTransactionsContent {
   type: ContentType.SignTransactions
diff --git a/sdk/packages/base/src/http-client.test.ts b/sdk/packages/base/src/http-client.test.ts
index 0dfb4b09..2b63b98c 100644
--- a/sdk/packages/base/src/http-client.test.ts
+++ b/sdk/packages/base/src/http-client.test.ts
@@ -1,12 +1,14 @@
+import { Network } from '@aptos-labs/ts-sdk'
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
 import { assert, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest'
-import { BaseApp } from './app'
-import { getRandomId } from './utils'
-import { testAppBaseInitialize } from './testUtils'
 import { smartDelay, TEST_RELAY_ENDPOINT } from '../../../commonTestUtils'
+import { BaseApp } from './app'
 import { Connect } from './client'
 import { MessageToSign, TransactionToSign } from './content'
-import { SignedMessage, SignedTransaction } from './responseContent'
 import { HttpBaseClient } from './http-client'
+import { SignedMessage, SignedTransaction } from './responseContent'
+import { testAppBaseInitialize } from './testUtils'
+import { getRandomId } from './utils'
 
 // Edit an assertion and save to see HMR in action
 
@@ -91,6 +93,26 @@ describe('Http Base Client tests', () => {
     const signed = await promiseSigned
     assert(signed.length === 2)
   })
+  test('#resolveChangeNetwork()', async () => {
+    const randomNewNetwork: AptosChangeNetworkInput = {
+      name: Network.MAINNET,
+      chainId: 27
+    }
+    // send change network
+    const newNetworkResponse = baseApp.changeNetwork(randomNewNetwork)
+    await smartDelay()
+    // Query for changed network
+    const pendingRequest = (await client.getPendingRequests({ sessionId: baseApp.sessionId }))[0]
+    await client.resolveChangeNetwork({
+      requestId: pendingRequest.requestId,
+      sessionId: baseApp.sessionId,
+      newNetwork: randomNewNetwork
+    })
+
+    await smartDelay()
+    const newNetwork = await newNetworkResponse
+    assert(newNetwork.newNetwork.chainId === 27)
+  })
   test('#reject()', async () => {
     try {
       const randomSignMessages: MessageToSign[] = [{ message: '1' }, { message: '13' }]
diff --git a/sdk/packages/base/src/http-client.ts b/sdk/packages/base/src/http-client.ts
index bbd02389..8d87ac19 100644
--- a/sdk/packages/base/src/http-client.ts
+++ b/sdk/packages/base/src/http-client.ts
@@ -1,21 +1,22 @@
 // import LocalStorage from 'isomorphic-localstorage'
-import { HttpEndpoint } from '../../../bindings/HttpEndpoint'
-import { HttpGetSessionInfoRequest } from '../../../bindings/HttpGetSessionInfoRequest'
-import { HttpGetSessionInfoResponse } from '../../../bindings/HttpGetSessionInfoResponse'
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
+import { fetch } from 'cross-fetch'
 import { HttpConnectSessionRequest } from '../../../bindings/HttpConnectSessionRequest'
 import { HttpConnectSessionResponse } from '../../../bindings/HttpConnectSessionResponse'
 import { HttpDropSessionsRequest } from '../../../bindings/HttpDropSessionsRequest'
 import { HttpDropSessionsResponse } from '../../../bindings/HttpDropSessionsResponse'
+import { HttpEndpoint } from '../../../bindings/HttpEndpoint'
+import { HttpGetPendingRequestRequest } from '../../../bindings/HttpGetPendingRequestRequest'
+import { HttpGetPendingRequestResponse } from '../../../bindings/HttpGetPendingRequestResponse'
+import { HttpGetPendingRequestsRequest } from '../../../bindings/HttpGetPendingRequestsRequest'
+import { HttpGetPendingRequestsResponse } from '../../../bindings/HttpGetPendingRequestsResponse'
+import { HttpGetSessionInfoRequest } from '../../../bindings/HttpGetSessionInfoRequest'
+import { HttpGetSessionInfoResponse } from '../../../bindings/HttpGetSessionInfoResponse'
 import { HttpGetSessionsRequest } from '../../../bindings/HttpGetSessionsRequest'
 import { HttpGetSessionsResponse } from '../../../bindings/HttpGetSessionsResponse'
 import { HttpResolveRequestRequest } from '../../../bindings/HttpResolveRequestRequest'
 import { HttpResolveRequestResponse } from '../../../bindings/HttpResolveRequestResponse'
-import { HttpGetPendingRequestsRequest } from '../../../bindings/HttpGetPendingRequestsRequest'
-import { HttpGetPendingRequestsResponse } from '../../../bindings/HttpGetPendingRequestsResponse'
-import { HttpGetPendingRequestRequest } from '../../../bindings/HttpGetPendingRequestRequest'
-import { HttpGetPendingRequestResponse } from '../../../bindings/HttpGetPendingRequestResponse'
-import { fetch } from 'cross-fetch'
-import { getRandomId } from './utils'
+import { RequestContent } from './content'
 import {
   CustomResponseContent,
   RejectResponseContent,
@@ -25,7 +26,7 @@ import {
   SignedMessage,
   SignedTransaction
 } from './responseContent'
-import { RequestContent } from './content'
+import { getRandomId } from './utils'
 
 export interface HttpBaseClientInitialize {
   clientId?: string
@@ -150,6 +151,25 @@ export class HttpBaseClient {
       content: JSON.stringify(content)
     })
   }
+  resolveChangeNetwork = async ({
+    requestId,
+    sessionId,
+    newNetwork,
+    clientId
+  }: HttpResolveChangeNetwork) => {
+    const client = clientId || this.clientId
+    const content = {
+      type: ResponseContentType.ChangedNetwork,
+      newNetwork: newNetwork
+    }
+
+    await this.resolveRequest({
+      requestId,
+      content: JSON.stringify(content),
+      sessionId,
+      clientId: client
+    })
+  }
   resolveSignMessages = async ({
     requestId,
     sessionId,
@@ -211,6 +231,12 @@ export interface HttpResolveSignMessages {
   signedMessages: SignedMessage[]
   clientId?: string
 }
+export interface HttpResolveChangeNetwork {
+  requestId: string
+  newNetwork: AptosChangeNetworkInput
+  sessionId: string
+  clientId?: string
+}
 export interface HttpResolveCustom {
   requestId: string
   sessionId: string
diff --git a/sdk/packages/base/src/responseContent.ts b/sdk/packages/base/src/responseContent.ts
index d45c8e9f..066eb55a 100644
--- a/sdk/packages/base/src/responseContent.ts
+++ b/sdk/packages/base/src/responseContent.ts
@@ -1,4 +1,4 @@
-import { ChangeNetworkTo } from './content'
+import { AptosChangeNetworkInput } from '@aptos-labs/wallet-standard'
 
 export enum ResponseContentType {
   SignMessages = 'SignMessagesResponse',
@@ -26,7 +26,7 @@ export interface SignTransactionsResponseContent {
 }
 export interface ChangeNetworkResponseContent {
   type: ResponseContentType.ChangedNetwork
-  newNetwork: ChangeNetworkTo
+  newNetwork: AptosChangeNetworkInput
 }
 export interface RejectResponseContent {
   type: ResponseContentType.Reject
diff --git a/sdk/packages/selector-aptos/package.json b/sdk/packages/selector-aptos/package.json
index 77e9c496..741eb36a 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.7",
+  "version": "0.1.8",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/sdk/pnpm-lock.yaml b/sdk/pnpm-lock.yaml
index 3944ed11..af0a92fa 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.7
+      '@nightlylabs/wallet-selector-aptos': 0.1.8
       '@nightlylabs/wallet-selector-base': ^0.4.1
       '@nightlylabs/wallet-selector-polkadot': 0.2.7
       '@nightlylabs/wallet-selector-solana': 0.3.6
@@ -188,6 +188,8 @@ importers:
       typescript: ^5.1.3
   packages/base:
     dependencies:
+      '@aptos-labs/ts-sdk': 1.24.0
+      '@aptos-labs/wallet-standard': 0.0.11
       cross-fetch: 3.1.8
       eventemitter3: 5.0.1
       isomorphic-localstorage: 1.0.2
@@ -206,6 +208,8 @@ importers:
       tslib: 2.6.3
       typescript: 5.5.3
     specifiers:
+      '@aptos-labs/ts-sdk': ^1.9.1
+      '@aptos-labs/wallet-standard': ^0.0.11
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.1.0
       '@rollup/plugin-terser': ^0.4.3
@@ -293,7 +297,7 @@ importers:
       vite: ^4.3.9
   packages/polkadot:
     dependencies:
-      '@nightlylabs/nightly-connect-base': 'link:../base'
+      '@nightlylabs/nightly-connect-base': 0.0.28
       '@polkadot/api': 10.13.1
       '@polkadot/extension-inject': 0.46.9
       '@polkadot/types': 10.13.1
@@ -317,7 +321,7 @@ importers:
       tweetnacl: 1.0.3
       typescript: 5.5.3
     specifiers:
-      '@nightlylabs/nightly-connect-base': 0.0.29
+      '@nightlylabs/nightly-connect-base': 0.0.28
       '@polkadot/api': ^10.10.1
       '@polkadot/extension-inject': ^0.46.5
       '@polkadot/keyring': ^12.5.1
@@ -527,7 +531,7 @@ importers:
       typescript: ^5.1.3
   packages/solana:
     dependencies:
-      '@nightlylabs/nightly-connect-base': 'link:../base'
+      '@nightlylabs/nightly-connect-base': 0.0.28
       '@solana/web3.js': 1.95.0
       eventemitter3: 5.0.1
       uuid: 9.0.1
@@ -546,7 +550,7 @@ importers:
       tweetnacl: 1.0.3
       typescript: 5.5.3
     specifiers:
-      '@nightlylabs/nightly-connect-base': 0.0.29
+      '@nightlylabs/nightly-connect-base': 0.0.28
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.1.0
       '@rollup/plugin-terser': ^0.4.3
@@ -567,7 +571,7 @@ importers:
     dependencies:
       '@mysten/sui': 1.3.0_typescript@5.5.3
       '@mysten/wallet-standard': 0.12.12_typescript@5.5.3
-      '@nightlylabs/nightly-connect-base': 'link:../base'
+      '@nightlylabs/nightly-connect-base': 0.0.28
       '@noble/hashes': 1.4.0
       eventemitter3: 5.0.1
       uuid: 9.0.1
@@ -589,7 +593,7 @@ importers:
     specifiers:
       '@mysten/sui': ^1.2.1
       '@mysten/wallet-standard': ^0.12.12
-      '@nightlylabs/nightly-connect-base': ^0.0.29
+      '@nightlylabs/nightly-connect-base': ^0.0.28
       '@noble/hashes': ^1.3.0
       '@rollup/plugin-commonjs': ^25.0.0
       '@rollup/plugin-node-resolve': ^15.2.1
@@ -4647,6 +4651,17 @@ packages:
     dev: false
     resolution:
       integrity: sha512-aDpQJicIjL7S+EzwBgUzMEY/L/HtFalfhf4APE3GaDqK9JqtLJDO9d2RmUQDinTtb1mG9MsHpWBtU6fjYo+PHw==
+  /@nightlylabs/nightly-connect-base/0.0.28:
+    dependencies:
+      cross-fetch: 3.1.8
+      eventemitter3: 5.0.1
+      isomorphic-localstorage: 1.0.2
+      isomorphic-ws: 5.0.0_ws@8.18.0
+      uuid: 9.0.1
+      ws: 8.18.0
+    dev: false
+    resolution:
+      integrity: sha512-lu8K4FITek/rTR9UsIMnejIvXiIWBiw75S/ije+ZFapJJ+P/7Yuqj1UTKXPzR+cN5uVOeszUWXzwjIk+vNp6Bw==
   /@nightlylabs/nightly-connect-solana/0.0.28:
     dependencies:
       '@nightlylabs/nightly-connect-base': 0.0.27

From c398a0912f879617f01b39657535a72a88893b65 Mon Sep 17 00:00:00 2001
From: LukassF <szkulkerolf@gmail.com>
Date: Tue, 17 Sep 2024 17:50:26 +0200
Subject: [PATCH 3/3] change button

---
 sdk/apps/modal-example/src/routes/aptos.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sdk/apps/modal-example/src/routes/aptos.tsx b/sdk/apps/modal-example/src/routes/aptos.tsx
index 31f66719..6214ee09 100644
--- a/sdk/apps/modal-example/src/routes/aptos.tsx
+++ b/sdk/apps/modal-example/src/routes/aptos.tsx
@@ -27,7 +27,6 @@ export default function AptosPage() {
   const [adapter, setAdapter] = createSignal<NightlyConnectAptosAdapter>()
   const [eager, setEager] = createSignal(false)
   const [accountInfo, setAccountInfo] = createSignal<AccountInfo>()
-  const [currentNetwork, setCurrentNetwork] = createSignal<string>()
 
   onMount(async () => {
     NightlyConnectAptosAdapter.build(
@@ -232,15 +231,14 @@ export default function AptosPage() {
                 changeNetworkResponse.status === UserResponseStatus.APPROVED
               ) {
                 const changedNetwork = await adapter()!.network()
-                toast.success(`Changed network to ${currentNetwork}!`)
-                setCurrentNetwork(changedNetwork.chainId === 27 ? 'Aptos' : 'Movement')
+                toast.success(`Changed network!`)
               }
             } catch (error) {
               toast.error("Couldn't change network")
               console.log(error)
             }
           }}>
-          Change to {currentNetwork()}
+          Change network
         </button>
         <button
           onClick={() => {