Move QR code modal methods to their own page object

e2e/pages/Receive/PaymentRequestQrModal.js

@@ -0,0 +1,19 @@
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+import { SendLinkViewSelectorsIDs } from '../../selectors/SendLinkView.selectors';
+
+class PaymentRequestQrModal {
+  get container() {
+    return Matchers.getElementByID(SendLinkViewSelectorsIDs.QR_MODAL);
+  }
+
+  get closeButton() {
+    return Matchers.getElementByID(SendLinkViewSelectorsIDs.CLOSE_QR_MODAL_BUTTON);
+  }
+
+  async tapCloseButton() {
+    await Gestures.waitAndTap(this.closeButton);
+  }
+}
+
+export default new PaymentRequestQrModal();

e2e/pages/SendLinkView.js → e2e/pages/Receive/SendLinkView.js

@@ -1,6 +1,6 @@
-import Matchers from '../utils/Matchers';
-import Gestures from '../utils/Gestures';
-import { SendLinkViewSelectorsIDs } from '../selectors/SendLinkView.selectors';
+import Matchers from '../../utils/Matchers';
+import Gestures from '../../utils/Gestures';
+import { SendLinkViewSelectorsIDs } from '../../selectors/SendLinkView.selectors';
 
 class SendLinkView {
   get container() {
@@ -11,10 +11,6 @@ class SendLinkView {
     return Matchers.getElementByID(SendLinkViewSelectorsIDs.QR_MODAL);
   }
 
-  get qrCloseButton() {
-    return Matchers.getElementByID(SendLinkViewSelectorsIDs.CLOSE_QR_MODAL_BUTTON);
-  }
-
   get closeSendLinkButton() {
     return Matchers.getElementByID(SendLinkViewSelectorsIDs.CLOSE_SEND_LINK_VIEW_BUTTON);
   }
@@ -32,11 +28,6 @@ class SendLinkView {
   async tapCloseSendLinkButton() {
     await Gestures.waitAndTap(this.closeSendLinkButton);
   }
-
-  // QR Modal
-  async tapQRCodeCloseButton() {
-    await Gestures.waitAndTap(this.qrCloseButton);
-  }
 }
 
 export default new SendLinkView();

e2e/specs/wallet/request-token-flow.spec.js

@@ -1,11 +1,12 @@
 'use strict';
 import { SmokeCore } from '../../tags';
-import SendLinkView from '../../pages/SendLinkView';
+import RequestPaymentModal from '../../pages/Receive/RequestPaymentModal';
+import SendLinkView from '../../pages/Receive/SendLinkView';
+import PaymentRequestQrModal from '../../pages/Receive/PaymentRequestQrModal';
 import RequestPaymentView from '../../pages/RequestPaymentView';
 import TabBarComponent from '../../pages/TabBarComponent';
 import WalletActionsModal from '../../pages/modals/WalletActionsModal';
 import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal';
-import RequestPaymentModal from '../../pages/modals/RequestPaymentModal';
 import { loginToApp } from '../../viewHelper';
 import {
   loadFixture,
@@ -68,11 +69,11 @@ describe(SmokeCore('Request Token Flow with Unprotected Wallet'), () => {
 
   it('should see DAI request QR code', async () => {
     await SendLinkView.tapQRCodeButton();
-    await Assertions.checkIfVisible(SendLinkView.qrModal);
+    await Assertions.checkIfVisible(PaymentRequestQrModal.container);
   });
 
   it('should close request', async () => {
-    await SendLinkView.tapQRCodeCloseButton();
+    await PaymentRequestQrModal.tapCloseButton();
     await SendLinkView.tapCloseSendLinkButton();
   });