From 9c1d060383383f86e24e17c098c2c326de358d16 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 30 Aug 2021 15:08:07 +0530
Subject: [PATCH] chore(cypress): config update

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 cypress.json                | 1 -
 cypress/support/commands.js | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cypress.json b/cypress.json
index a2fe63de9b..11ac89e6ae 100644
--- a/cypress.json
+++ b/cypress.json
@@ -5,6 +5,5 @@
   "viewportWidth": 1980,
   "viewportHeight": 1000,
   "video": false,
-  "retries": 2,
   "screenshotOnRunFailure": false
 }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 053986f095..6c3b43c6af 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -155,15 +155,15 @@ Cypress.Commands.add("restoreLocalStorage", () => {
 });
 
 Cypress.Commands.add("getActiveModal", () => {
-  return cy.get('.v-dialog.v-dialog--active')
+  return cy.get('.v-dialog.v-dialog--active').last()
 });
 
 Cypress.Commands.add("getActiveMenu", () => {
-  return cy.get('.menuable__content__active')
+  return cy.get('.menuable__content__active').last()
 });
 
 Cypress.Commands.add("getActiveModal", () => {
-  return cy.get('.v-dialog__content--active')
+  return cy.get('.v-dialog__content--active').last()
 });