diff --git a/src/wallet/pages/add-network.ts b/src/wallet/pages/add-network.ts
index 4e1dd3e..085cbb1 100644
--- a/src/wallet/pages/add-network.ts
+++ b/src/wallet/pages/add-network.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class AddNetwork implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly addNetwork: InstanceType<typeof DappDriver.Instance.Extension.pages.AddNetwork>;
+  private readonly addNetwork: IConfirmation;
 
   constructor() {
     this.addNetwork = new DappDriver.Instance.Extension.pages.AddNetwork();
@@ -58,7 +58,6 @@ export class AddNetwork implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof AddNetwork
diff --git a/src/wallet/pages/approve-all.ts b/src/wallet/pages/approve-all.ts
index d29d1cf..5cdf605 100644
--- a/src/wallet/pages/approve-all.ts
+++ b/src/wallet/pages/approve-all.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class ApproveAll implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly approveAll: InstanceType<typeof DappDriver.Instance.Extension.pages.ApproveAll>;
+  private readonly approveAll: IConfirmation;
 
   constructor() {
     this.approveAll = new DappDriver.Instance.Extension.pages.ApproveAll();
@@ -57,7 +57,6 @@ export class ApproveAll implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof ApproveAll
diff --git a/src/wallet/pages/approve.ts b/src/wallet/pages/approve.ts
index f893c99..c8c55f6 100644
--- a/src/wallet/pages/approve.ts
+++ b/src/wallet/pages/approve.ts
@@ -5,7 +5,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class Approve implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly approve: InstanceType<typeof DappDriver.Instance.Extension.pages.Approve>;
+  private readonly approve: IConfirmation;
 
   constructor() {
     this.approve = new DappDriver.Instance.Extension.pages.Approve();
@@ -51,7 +51,6 @@ export class Approve implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof Approve
diff --git a/src/wallet/pages/confirm-transaction.ts b/src/wallet/pages/confirm-transaction.ts
index dbb3f40..1c415a8 100644
--- a/src/wallet/pages/confirm-transaction.ts
+++ b/src/wallet/pages/confirm-transaction.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class ConfirmTransaction implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly confirmTx: InstanceType<typeof DappDriver.Instance.Extension.pages.ConfirmTransaction>;
+  private readonly confirmTx: IConfirmation;
 
   constructor() {
     this.confirmTx = new DappDriver.Instance.Extension.pages.ConfirmTransaction();
@@ -58,7 +58,6 @@ export class ConfirmTransaction implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof ConfirmTransaction
diff --git a/src/wallet/pages/connect.ts b/src/wallet/pages/connect.ts
index e776fe8..7865333 100644
--- a/src/wallet/pages/connect.ts
+++ b/src/wallet/pages/connect.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class Connect implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly connect: InstanceType<typeof DappDriver.Instance.Extension.pages.Connect>;
+  private readonly connect: IConfirmation;
 
   constructor() {
     this.connect = new DappDriver.Instance.Extension.pages.Connect();
@@ -58,7 +58,6 @@ export class Connect implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof Connect
diff --git a/src/wallet/pages/send.ts b/src/wallet/pages/send.ts
index 9b793f9..6e11cba 100644
--- a/src/wallet/pages/send.ts
+++ b/src/wallet/pages/send.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class Send implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly send: InstanceType<typeof DappDriver.Instance.Extension.pages.Send>;
+  private readonly send: IConfirmation;
 
   constructor() {
     this.send = new DappDriver.Instance.Extension.pages.Send();
@@ -58,7 +58,6 @@ export class Send implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof Send
diff --git a/src/wallet/pages/sign-in-request.ts b/src/wallet/pages/sign-in-request.ts
index 0917b73..84e0ef2 100644
--- a/src/wallet/pages/sign-in-request.ts
+++ b/src/wallet/pages/sign-in-request.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class SignInRequest implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly signInRequest: InstanceType<typeof DappDriver.Instance.Extension.pages.SignInRequest>;
+  private readonly signInRequest: IConfirmation;
 
   constructor() {
     this.signInRequest = new DappDriver.Instance.Extension.pages.SignInRequest();
@@ -58,7 +58,6 @@ export class SignInRequest implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof SignInRequest
diff --git a/src/wallet/pages/sign-message.ts b/src/wallet/pages/sign-message.ts
index fd975c1..ddb6799 100644
--- a/src/wallet/pages/sign-message.ts
+++ b/src/wallet/pages/sign-message.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class SignMessage implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly signMessage: InstanceType<typeof DappDriver.Instance.Extension.pages.SignMessage>;
+  private readonly signMessage: IConfirmation;
 
   constructor() {
     this.signMessage = new DappDriver.Instance.Extension.pages.SignMessage();
@@ -58,7 +58,6 @@ export class SignMessage implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof SignMessage
diff --git a/src/wallet/pages/signature-request.ts b/src/wallet/pages/signature-request.ts
index 1bba022..b726895 100644
--- a/src/wallet/pages/signature-request.ts
+++ b/src/wallet/pages/signature-request.ts
@@ -12,7 +12,7 @@ import { DappDriver } from '../../session/dapp-driver';
 export class SignatureRequest implements IConfirmation {
   public url: string | RegExp;
   public title: string;
-  private readonly signatureRequest: InstanceType<typeof DappDriver.Instance.Extension.pages.SignatureRequest>;
+  private readonly signatureRequest: IConfirmation;
 
   constructor() {
     this.signatureRequest = new DappDriver.Instance.Extension.pages.SignatureRequest();
@@ -57,7 +57,6 @@ export class SignatureRequest implements IConfirmation {
    *
    *
    * @template TPage
-   * @param {*} nameOrHandle
    * @param {new () => TPage} page
    * @return {*}  {Promise<TPage>}
    * @memberof SignatureRequest