adjust UI to changes. add missing userUrl prop in specs

pawelstepien-da · pawelstepien-da · commit 68d9c5c24717 · 2025-12-03T17:01:04.000+01:00
Signed-off-by: Pawel Stepien &lt;pawel.stepien@digitalasset.com&gt;
diff --git a/api-specs/openrpc-dapp-api.json b/api-specs/openrpc-dapp-api.json
@@ -529,6 +529,9 @@
                         "type": "string",
                         "description": "If not connected to a network, the reason why."
                     },
+                    "userUrl": {
+                        "$ref": "#/components/schemas/UserUrl"
+                    },
                     "network": {
                         "title": "network",
                         "type": "object",
@@ -575,7 +578,12 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": ["kernel", "isConnected", "isNetworkConnected"]
+                "required": [
+                    "kernel",
+                    "isConnected",
+                    "isNetworkConnected",
+                    "userUrl"
+                ]
             }
         }
     }
diff --git a/api-specs/openrpc-dapp-remote-api.json b/api-specs/openrpc-dapp-remote-api.json
@@ -558,6 +558,9 @@
                         "type": "string",
                         "description": "If not connected to a network, the reason why."
                     },
+                    "userUrl": {
+                        "$ref": "#/components/schemas/UserUrl"
+                    },
                     "network": {
                         "title": "network",
                         "type": "object",
@@ -604,7 +607,12 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": ["kernel", "isConnected", "isNetworkConnected"]
+                "required": [
+                    "kernel",
+                    "isConnected",
+                    "isNetworkConnected",
+                    "userUrl"
+                ]
             }
         }
     }
diff --git a/core/wallet-dapp-remote-rpc-client/package.json b/core/wallet-dapp-remote-rpc-client/package.json
@@ -3,6 +3,7 @@
     "version": "0.9.1",
     "type": "module",
     "description": "TypeScript client generated by OpenRPC",
+    "repository": "github:hyperledger-labs/splice-wallet-kernel",
     "license": "Apache-2.0",
     "main": "dist/index.cjs",
     "module": "dist/index.js",
@@ -43,10 +44,5 @@
         "tsup": "^8.5.1",
         "typedoc": "^0.28.14",
         "typescript": "^5.9.3"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/hyperledger-labs/splice-wallet-kernel.git",
-        "directory": "core/wallet-dapp-remote-rpc-client"
     }
 }
diff --git a/core/wallet-dapp-remote-rpc-client/src/index.ts b/core/wallet-dapp-remote-rpc-client/src/index.ts
@@ -134,6 +134,12 @@ export type IsNetworkConnected = boolean
  *
  */
 export type NetworkReason = string
+/**
+ *
+ * A URL that points to a user interface.
+ *
+ */
+export type UserUrl = string
 /**
  *
  * The network ID the wallet corresponds to.
@@ -192,6 +198,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
+    userUrl: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
@@ -226,12 +233,6 @@ export interface JsPrepareSubmissionResponse {
     preparedTransactionHash?: PreparedTransactionHash
     [k: string]: any
 }
-/**
- *
- * A URL that points to a user interface.
- *
- */
-export type UserUrl = string
 export type Response = string
 /**
  *
diff --git a/core/wallet-dapp-remote-rpc-client/src/openrpc.json b/core/wallet-dapp-remote-rpc-client/src/openrpc.json
@@ -558,6 +558,9 @@
                         "type": "string",
                         "description": "If not connected to a network, the reason why."
                     },
+                    "userUrl": {
+                        "$ref": "#/components/schemas/UserUrl"
+                    },
                     "network": {
                         "title": "network",
                         "type": "object",
@@ -604,7 +607,12 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": ["kernel", "isConnected", "isNetworkConnected"]
+                "required": [
+                    "kernel",
+                    "isConnected",
+                    "isNetworkConnected",
+                    "userUrl"
+                ]
             }
         }
     }
diff --git a/core/wallet-dapp-rpc-client/package.json b/core/wallet-dapp-rpc-client/package.json
@@ -3,6 +3,7 @@
     "version": "0.15.1",
     "type": "module",
     "description": "TypeScript client generated by OpenRPC",
+    "repository": "github:hyperledger-labs/splice-wallet-kernel",
     "license": "Apache-2.0",
     "main": "dist/index.cjs",
     "module": "dist/index.js",
@@ -43,10 +44,5 @@
         "tsup": "^8.5.1",
         "typedoc": "^0.28.14",
         "typescript": "^5.9.3"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/hyperledger-labs/splice-wallet-kernel.git",
-        "directory": "core/wallet-dapp-rpc-client"
     }
 }
diff --git a/core/wallet-dapp-rpc-client/src/index.ts b/core/wallet-dapp-rpc-client/src/index.ts
@@ -199,6 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
+    userUrl: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/core/wallet-dapp-rpc-client/src/openrpc.json b/core/wallet-dapp-rpc-client/src/openrpc.json
@@ -529,6 +529,9 @@
                         "type": "string",
                         "description": "If not connected to a network, the reason why."
                     },
+                    "userUrl": {
+                        "$ref": "#/components/schemas/UserUrl"
+                    },
                     "network": {
                         "title": "network",
                         "type": "object",
@@ -575,7 +578,12 @@
                         "required": ["accessToken", "userId"]
                     }
                 },
-                "required": ["kernel", "isConnected", "isNetworkConnected"]
+                "required": [
+                    "kernel",
+                    "isConnected",
+                    "isNetworkConnected",
+                    "userUrl"
+                ]
             }
         }
     }
diff --git a/examples/ping/src/App.tsx b/examples/ping/src/App.tsx
@@ -224,10 +224,10 @@ function App() {
                         <br />
                         <b>connected:</b>{' '}
                         <i>{status.isConnected ? '🟢' : '🔴'}</i>
-                        {status.networkId && (
+                        {status.network && (
                             <span>
                                 <br />
-                                <b>network:</b> <i>{status.networkId}</i>
+                                <b>network ID:</b> <i>{status.network.networkId}</i>
                             </span>
                         )}
                         {ledgerApiVersion && (
diff --git a/sdk/dapp-sdk/src/dapp-api/rpc-gen/typings.ts b/sdk/dapp-sdk/src/dapp-api/rpc-gen/typings.ts
@@ -199,6 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
+    userUrl: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/wallet-gateway/extension/src/dapp-api/rpc-gen/typings.ts b/wallet-gateway/extension/src/dapp-api/rpc-gen/typings.ts
@@ -199,6 +199,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
+    userUrl: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
diff --git a/wallet-gateway/remote/src/dapp-api/controller.ts b/wallet-gateway/remote/src/dapp-api/controller.ts
@@ -64,6 +64,16 @@ export const dappController = (
                     isNetworkConnected: status.isConnected,
                     networkReason: status.reason ? status.reason : 'OK',
                     userUrl: `${userUrl}/login/`,
+                    network: {
+                        networkId: network.id,
+                        ledgerApi: {
+                            baseUrl: network.ledgerApi.baseUrl,
+                        },
+                    },
+                    session: {
+                        accessToken: context.accessToken,
+                        userId: context.userId,
+                    },
                 },
             }
         },
@@ -204,6 +214,7 @@ export const dappController = (
                     isConnected: false,
                     isNetworkConnected: false,
                     networkReason: 'Unauthenticated',
+                    userUrl: `${userUrl}/login/`,
                 }
             }
 
@@ -220,7 +231,17 @@ export const dappController = (
                 isConnected: true,
                 isNetworkConnected: status.isConnected,
                 networkReason: status.reason ? status.reason : 'OK',
-                networkId: (await store.getCurrentNetwork()).id,
+                userUrl: `${userUrl}/login/`,
+                network: {
+                    networkId: network.id,
+                    ledgerApi: {
+                        baseUrl: network.ledgerApi.baseUrl,
+                    },
+                },
+                session: {
+                    accessToken: context.accessToken,
+                    userId: context.userId,
+                },
             }
         },
         onConnected: async () => {
diff --git a/wallet-gateway/remote/src/dapp-api/rpc-gen/typings.ts b/wallet-gateway/remote/src/dapp-api/rpc-gen/typings.ts
@@ -134,6 +134,12 @@ export type IsNetworkConnected = boolean
  *
  */
 export type NetworkReason = string
+/**
+ *
+ * A URL that points to a user interface.
+ *
+ */
+export type UserUrl = string
 /**
  *
  * The network ID the wallet corresponds to.
@@ -192,6 +198,7 @@ export interface StatusEvent {
     isConnected: IsConnected
     isNetworkConnected: IsNetworkConnected
     networkReason?: NetworkReason
+    userUrl: UserUrl
     network?: Network
     session?: Session
     [k: string]: any
@@ -226,12 +233,6 @@ export interface JsPrepareSubmissionResponse {
     preparedTransactionHash?: PreparedTransactionHash
     [k: string]: any
 }
-/**
- *
- * A URL that points to a user interface.
- *
- */
-export type UserUrl = string
 export type Response = string
 /**
  *

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,9 @@`
`529`	`529`	`"type": "string",`
`530`	`530`	`"description": "If not connected to a network, the reason why."`
`531`	`531`	`},`
	`532`	`+ "userUrl": {`
	`533`	`+ "$ref": "#/components/schemas/UserUrl"`
	`534`	`+ },`
`532`	`535`	`"network": {`
`533`	`536`	`"title": "network",`
`534`	`537`	`"type": "object",`
`@@ -575,7 +578,12 @@`
`575`	`578`	`"required": ["accessToken", "userId"]`
`576`	`579`	`}`
`577`	`580`	`},`
`578`		`- "required": ["kernel", "isConnected", "isNetworkConnected"]`
	`581`	`+ "required": [`
	`582`	`+ "kernel",`
	`583`	`+ "isConnected",`
	`584`	`+ "isNetworkConnected",`
	`585`	`+ "userUrl"`
	`586`	`+ ]`
`579`	`587`	`}`
`580`	`588`	`}`
`581`	`589`	`}`
Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,9 @@`
`558`	`558`	`"type": "string",`
`559`	`559`	`"description": "If not connected to a network, the reason why."`
`560`	`560`	`},`
	`561`	`+ "userUrl": {`
	`562`	`+ "$ref": "#/components/schemas/UserUrl"`
	`563`	`+ },`
`561`	`564`	`"network": {`
`562`	`565`	`"title": "network",`
`563`	`566`	`"type": "object",`
`@@ -604,7 +607,12 @@`
`604`	`607`	`"required": ["accessToken", "userId"]`
`605`	`608`	`}`
`606`	`609`	`},`
`607`		`- "required": ["kernel", "isConnected", "isNetworkConnected"]`
	`610`	`+ "required": [`
	`611`	`+ "kernel",`
	`612`	`+ "isConnected",`
	`613`	`+ "isNetworkConnected",`
	`614`	`+ "userUrl"`
	`615`	`+ ]`
`608`	`616`	`}`
`609`	`617`	`}`
`610`	`618`	`}`