fixing files

Author: nmscode

cypress/e2e/timeline/timeline.spec.ts

@@ -238,7 +238,11 @@ describe("Timeline", () => {
             cy.contains(".mx_RoomView_body .mx_EventTile[data-scroll-tokens]", "MessageEdit").should("exist");
 
             // Click top left of the event toggle, which should not be covered by MessageActionBar's safe area
+<<<<<<< HEAD
             cy.get(".mx_EventTile .mx_ViewSourceEvent").should("exist").realHover().within(() => {
+=======
+            cy.get(".mx_EventTile .mx_ViewSourceEvent").realHover().within(() => {
+>>>>>>> 2211a431b4 (fixing files)
                 cy.get(".mx_ViewSourceEvent_toggle").click('topLeft', { force: false });
             });
 

cypress/e2e/user-onboarding/user-onboarding-new.ts

@@ -54,11 +54,24 @@ describe("User Onboarding (new user)", () => {
         cy.stopSynapse(synapse);
     });
 
+<<<<<<< HEAD
     it("page is shown and preference exists", () => {
         cy.get('.mx_UserOnboardingPage')
             .percySnapshotElement("User onboarding page");
         cy.openUserSettings("Preferences");
         cy.contains("Show shortcut to welcome checklist above the room list").should("exist");
+=======
+    it("page is shown", () => {
+        cy.get('.mx_UserOnboardingPage').should('exist');
+        cy.get('.mx_UserOnboardingList')
+            .should('exist')
+            .should(($list) => {
+                const list = $list.get(0);
+                expect(getComputedStyle(list).opacity).to.be.eq("1");
+            });
+        cy.get('.mx_UserOnboardingPage')
+            .percySnapshotElement("User onboarding page");
+>>>>>>> 2211a431b4 (fixing files)
     });
 
     it("app download dialog", () => {