chore: merge 4.67.0 into master (#6819)

Author: diegolmello

.detoxrc.js

@@ -4,8 +4,12 @@ tags:
   - 'util'
 
 ---
-- clearState
 - stopApp: chat.rocket.reactnative
+- runFlow:
+    when:
+      true: CLEAR_STATE
+    commands:
+      - clearState: chat.rocket.reactnative
 - evalScript: ${output.login = output.utils.login(USERNAME, PASSWORD)}
 - runFlow:
     file: 'open-deeplink.yaml'

.maestro/helpers/login-with-deeplink.yaml

@@ -19,3 +19,9 @@ tags:
           text: Open
           index: 1
           optional: true
+- runFlow:
+    when:
+      visible: '.*Would like to send you notifications.*'
+      platform: iOS
+    commands:
+      - tapOn: 'Allow'

.maestro/helpers/open-deeplink.yaml

@@ -11,7 +11,8 @@ const data = {
 			name: 'detox-public-protected',
 			joinCode: '123'
 		}
-	}
+	},
+	e2eePassword: 'Password1@abcdefghijklmnopqrst'
 };
 
 output.data = data;

.maestro/scripts/data.js

@@ -32,10 +32,6 @@ tags:
     visible:
       id: 'rooms-list-header-server-add'
     timeout: 60000
-- extendedWaitUntil:
-    visible:
-      id: 'rooms-list-header-create-workspace-button'
-    timeout: 60000
 
 # should login to server, add new server, close the app, open the app and show previous logged server
 - tapOn:
@@ -53,6 +49,8 @@ tags:
       id: 'workspace-view'
     timeout: 60000
 - launchApp
+- waitForAnimationToEnd:
+    timeout: 500
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-view'
@@ -73,6 +71,8 @@ tags:
     visible:
       id: 'server-item-${output.data.alternateServer}'
     timeout: 60000
+- waitForAnimationToEnd:
+    timeout: 5000
 - tapOn:
     id: 'server-item-${output.data.alternateServer}'
 - extendedWaitUntil:
@@ -111,6 +111,8 @@ tags:
     visible:
       id: 'rooms-list-header-servers-list-button'
     timeout: 60000
+- waitForAnimationToEnd:
+    timeout: 5000
 - tapOn:
     id: 'rooms-list-header-servers-list-button'
 - extendedWaitUntil:
@@ -123,6 +125,8 @@ tags:
     timeout: 60000
 - tapOn:
     id: 'server-item-${output.data.server}'
+- waitForAnimationToEnd:
+    timeout: 500
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-view'
@@ -138,6 +142,8 @@ tags:
 
 # should reopen the app and show main server
 - launchApp
+- waitForAnimationToEnd:
+    timeout: 500
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-view'
@@ -146,3 +152,51 @@ tags:
     file: './utils/check-server.yaml'
     env:
       server: ${output.data.server}
+
+# should test swipe to delete on alternate server
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-header-servers-list-button'
+    timeout: 60000
+- tapOn:
+    id: 'rooms-list-header-servers-list-button'
+- extendedWaitUntil:
+    visible:
+      id: 'server-item-${output.data.alternateServer}'
+    timeout: 60000
+
+# swipe left to reveal delete button
+- swipe:
+    direction: LEFT
+    from:
+      id: 'server-item-${output.data.alternateServer}'
+
+# tap delete button
+- tapOn:
+    id: 'server-item-${output.data.alternateServer}-delete'
+
+# confirm deletion
+- extendedWaitUntil:
+    visible:
+      text: '.*Delete.*'
+    timeout: 60000
+- tapOn:
+    text: 'Delete'
+
+# verify alternate server is deleted
+- waitForAnimationToEnd:
+    timeout: 500
+- extendedWaitUntil:
+    visible:
+      id: 'rooms-list-header-servers-list-button'
+    timeout: 60000
+- tapOn:
+    id: 'rooms-list-header-servers-list-button'
+- extendedWaitUntil:
+    notVisible:
+      id: 'server-item-${output.data.alternateServer}'
+    timeout: 60000
+
+# verify main server still exists
+- assertVisible:
+    id: 'server-item-${output.data.server}'

.maestro/tests/assorted/changeserver.yaml

@@ -77,14 +77,26 @@ tags:
     visible:
       id: 'server-item-${output.data.server}'
     timeout: 60000
-- longPressOn:
-    id: 'server-item-${output.data.server}'
+
+# swipe left to reveal delete button
+- swipe:
+    direction: LEFT
+    from:
+      id: 'server-item-${output.data.server}'
+
+# tap delete button
+- tapOn:
+    id: 'server-item-${output.data.server}-delete'
+
+# confirm deletion
 - extendedWaitUntil:
     visible:
       text: '.*Delete.*'
     timeout: 60000
 - tapOn:
     text: 'Delete'
+- waitForAnimationToEnd:
+    timeout: 300
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-header-servers-list-button'