feat: update metamask siwe page object

assert-equals · Sep 11, 2024 · 2de683b · 2de683b
1 parent 5ebcf89
commit 2de683b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/metamask/pages/sign-in-request.ts b/src/metamask/pages/sign-in-request.ts
@@ -1,3 +1,4 @@
+import { HTMLElement } from '../../controls/html-element';
 import { IConfirmation } from '../../interface/wallet/confirmation';
 import { ConfirmTransaction } from './confirm-transaction';
 
@@ -10,11 +11,32 @@ import { ConfirmTransaction } from './confirm-transaction';
  * @implements {IConfirmation}
  */
 export class SignInRequest extends ConfirmTransaction implements IConfirmation {
+  protected nextButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-button"]');
+  protected cancelButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-cancel-button"]');
+  private scrollButton: () => HTMLElement = () => new HTMLElement('[aria-label="Scroll down"]', 8000);
   /**
    * Creates an instance of SignInRequest.
    * @memberof SignInRequest
    */
   constructor() {
-    super(new RegExp(/#confirm-transaction\/.*\/signature-request/), 'MetaMask');
+    super(new RegExp(/#confirm-transaction/), 'MetaMask');
+  }
+  /**
+   *
+   *
+   * @template TPage
+   * @param {new () => TPage} [page]
+   * @return {*}  {Promise<any>}
+   * @memberof SignInRequest
+   */
+  async accept<TPage>(page?: new () => TPage): Promise<any> {
+    if (await this.scrollButton().isDisplayed()) {
+      await this.scrollButton().clickAndWait();
+    }
+    if (page) {
+      return await this.nextButton().clickAndSwitchToMainWindow<TPage>(page);
+    } else {
+      return await this.nextButton().click();
+    }
   }
 }
diff --git a/src/metamask/pages/sign-message.ts b/src/metamask/pages/sign-message.ts
@@ -12,6 +12,7 @@ import { ConfirmTransaction } from './confirm-transaction';
  */
 export class SignMessage extends ConfirmTransaction implements IConfirmation {
   protected nextButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-button"]');
+  protected cancelButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-cancel-button"]');
   private scrollButton: () => HTMLElement = () => new HTMLElement('[aria-label="Scroll down"]', 8000);
   /**
    * Creates an instance of SignMessage.

diff --git a/src/metamask/pages/signature-request.ts b/src/metamask/pages/signature-request.ts
@@ -12,6 +12,7 @@ import { ConfirmTransaction } from './confirm-transaction';
  */
 export class SignatureRequest extends ConfirmTransaction implements IConfirmation {
   protected nextButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-button"]');
+  protected cancelButton: () => HTMLElement = () => new HTMLElement('[data-testid="confirm-footer-cancel-button"]');
   private scrollButton: () => HTMLElement = () => new HTMLElement('[aria-label="Scroll down"]', 8000);
   /**
    * Creates an instance of SignatureRequest.