Merge pull request #1174 from chaynHQ/develop

Merge Develop onto Main

cypress.config.ts

@@ -22,5 +22,6 @@ export default defineConfig({
     baseUrl: process.env.NEXT_PUBLIC_BASE_URL,
     supportFile: 'cypress/support/index.js',
     experimentalRunAllSpecs: true,
+    chromeWebSecurity: false,
   },
 });

cypress/integration/tests/user-messaging.cy.tsx

@@ -8,8 +8,8 @@ describe('A logged in public user can', () => {
     cy.logInWithEmailAndPassword(email, password);
   });
 
-  it('Navigate to the messaging page and begin a messaging', () => {
-    cy.visit('/'); //intitial home page visit
+  it('Navigate to the messaging page', () => {
+    cy.visit('/'); // initial home page visit
     cy.get(`[qa-id=secondary-nav-messaging-button]`, { timeout: 8000 }).should('exist').click(); //go to messaging page
   });
 
@@ -18,8 +18,8 @@ describe('A logged in public user can', () => {
     cy.get('h2').contains('Tell us what’s on your mind');
     cy.get('h2').contains('Meet the Bloom team');
     cy.get('h2').contains('More about how Bloom’s Messaging works');
-    cy.checkImage('alt', 'Illustration of a person sitting');
-    cy.get('p').contains('Who is 1-1 Messaging for?');
+    cy.checkImage('Illustration of a person sitting', 'illustration_course_dbr');
+    cy.get('h3').contains('Who is 1-1 Messaging for?');
     cy.get('p').contains(
       '1-1 Messaging is available for everyone using Bloom, regardless of your background, race, age, disability, religion or belief, sexuality, gender identity or expression, or life circumstances—we are here for you.',
     );

messages/messaging/de.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Sagen Sie uns, was Ihnen auf dem Herzen liegt",
-    "messageReplies": "Sei versichert, dass wir auf jede einzelne Nachricht antworten."
+    "messageHeading": "Sagen Sie uns, was Ihnen auf dem Herzen liegt"
   }
 }

messages/messaging/en.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Tell us what’s on your mind",
-    "messageReplies": "Rest assured we reply to every single message."
+    "messageHeading": "Tell us what’s on your mind"
   }
 }

messages/messaging/es.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Cuéntanos qué tienes en mente",
-    "messageReplies": "Puedes tener la seguridad de que respondemos a todos y cada uno de los mensajes."
+    "messageHeading": "Cuéntanos qué tienes en mente"
   }
 }

messages/messaging/fr.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Dites-nous ce qui vous préoccupe",
-    "messageReplies": "Nous t’assurons que nous répondons à chaque message."
+    "messageHeading": "Dites-nous ce qui vous préoccupe"
   }
 }

messages/messaging/hi.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Hume bataiye ki aapke mann mein kya hai",
-    "messageReplies": "Aur aap nishchint rahein, hum har ek message ka reply karte hain."
+    "messageHeading": "Hume bataiye ki aapke mann mein kya hai"
   }
 }

messages/messaging/pt.json

@@ -1,6 +1,5 @@
 {
   "Messaging": {
-    "messageHeading": "Diga-nos o que está pensando",
-    "messageReplies": "Tenha certeza de que respondemos a todas as mensagens."
+    "messageHeading": "Diga-nos o que está pensando"
   }
 }

pages/messaging.tsx

@@ -74,7 +74,6 @@ const Message: NextPage<Props> = ({ story }) => {
                 </Box>
                 <Box flex={1}>
                   <CrispIframe />
-                  <Typography>{t('messageReplies')}</Typography>
                 </Box>
               </Box>
             </Container>