Remember whether the welcome screen was seen

frontend/controller/actions/identity.js

@@ -668,5 +668,6 @@ export default (sbp('sbp/selectors/register', {
     return sbp('okTurtles.eventQueue/queueEvent', 'ACTIONS-LOGIN', ['gi.actions/identity/_private/logout', ...params])
   },
   ...encryptedAction('gi.actions/identity/saveFileDeleteToken', L('Failed to save delete tokens for the attachments.')),
-  ...encryptedAction('gi.actions/identity/removeFileDeleteToken', L('Failed to remove delete tokens for the attachments.'))
+  ...encryptedAction('gi.actions/identity/removeFileDeleteToken', L('Failed to remove delete tokens for the attachments.')),
+  ...encryptedAction('gi.actions/identity/setGroupAttributes', L('Failed to set group attributes.'))
 }): string[])

frontend/controller/router.js

@@ -33,7 +33,14 @@ Vue.use(Router)
  */
 const homeGuard = {
   guard: (to, from) => !!store.state.currentGroupId,
-  redirect: (to, from) => ({ path: store.getters.ourProfileActive ? '/dashboard' : '/pending-approval' })
+  redirect: (to, from) => ({
+    path:
+      // If we haven't accepted the invite OR we haven't clicked 'Awesome' on
+      // the welcome screen, redirect to the '/pending-approval' page
+      (store.getters.ourProfileActive && store.getters.currentIdentityState?.groups?.[store.state.currentGroupId]?.seenWelcomeScreen)
+        ? '/dashboard'
+        : '/pending-approval'
+  })
 }
 
 const loginGuard = {

frontend/model/contracts/identity.js

@@ -2,7 +2,7 @@
 
 import { L } from '@common/common.js'
 import sbp from '@sbp/sbp'
-import { arrayOf, boolean, object, objectMaybeOf, objectOf, optional, string, stringMax, unionOf } from '~/frontend/model/contracts/misc/flowTyper.js'
+import { arrayOf, boolean, object, objectMaybeOf, objectOf, optional, string, stringMax, unionOf, validatorFrom } from '~/frontend/model/contracts/misc/flowTyper.js'
 import { LEFT_GROUP } from '~/frontend/utils/events.js'
 import { Secret } from '~/shared/domains/chelonia/Secret.js'
 import { findForeignKeysByContractID, findKeyIdByName } from '~/shared/domains/chelonia/utils.js'
@@ -359,6 +359,26 @@ sbp('chelonia/defineContract', {
           delete state.fileDeleteTokens[manifestCid]
         }
       }
+    },
+    'gi.contracts/identity/setGroupAttributes': {
+      validate: objectOf({
+        groupContractID: string,
+        attributes: objectMaybeOf({
+          seenWelcomeScreen: validatorFrom((v) => v === true)
+        })
+      }),
+      process ({ data }, { state }) {
+        const { groupContractID, attributes } = data
+        if (!has(state.groups, groupContractID) || state.groups[groupContractID].hasLeft) {
+          throw new Error('Can\'t set attributes of groups you\'re not a member of')
+        }
+        if (attributes.seenWelcomeScreen) {
+          if (state.groups[groupContractID].seenWelcomeScreen) {
+            throw new Error('seenWelcomeScreen already set')
+          }
+          state.groups[groupContractID].seenWelcomeScreen = attributes.seenWelcomeScreen
+        }
+      }
     }
   },
   methods: {

frontend/views/components/GroupWelcome.vue

@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import sbp from '@sbp/sbp'
+import { mapGetters, mapState } from 'vuex'
 import Avatar from '@components/Avatar.vue'
 import ConfettiAnimation from '@components/confetti-animation/ConfettiAnimation.vue'
 
@@ -41,7 +42,8 @@ export default ({
     $v: { type: Object }
   },
   computed: {
-    ...mapGetters(['groupSettings'])
+    ...mapState(['currentGroupId']),
+    ...mapGetters(['groupSettings', 'ourIdentityContractId'])
   },
   data () {
     return {
@@ -52,6 +54,14 @@ export default ({
     toDashboard () {
       if (this.isButtonClicked) return
       this.isButtonClicked = true
+      const groupContractID = this.currentGroupId
+      sbp('gi.actions/identity/setGroupAttributes', {
+        contractID: this.ourIdentityContractId,
+        data: {
+          groupContractID,
+          attributes: { seenWelcomeScreen: true }
+        }
+      }).catch(e => console.warn('[GroupWelcome.vue] Error setting seenWelcomeScreen attribute', groupContractID, e))
       this.$router.push({ path: '/dashboard' })
     }
   }

test/cypress/support/commands.js

@@ -230,8 +230,15 @@ Cypress.Commands.add('giLogin', (username, {
       }).then(() => {
         if (firstLoginAfterJoinGroup) {
           const router = sbp('controller/router')
+          const state = sbp('state/vuex/state')
           if (router.history.current.path === '/dashboard') return
-          return router.push({ path: '/dashboard' }) // .catch(() => {})
+          return sbp('gi.actions/identity/setGroupAttributes', {
+            contractID: state.loggedIn.identityContractID,
+            data: {
+              groupContractID: state.currentGroupId,
+              attributes: { seenWelcomeScreen: true }
+            }
+          }).then(() => router.push({ path: '/dashboard' })) // .catch(() => {})
         }
       })
     })
@@ -331,7 +338,7 @@ Cypress.Commands.add('giCreateGroup', (name, {
 
           const timeoutId = setTimeout(() => {
             reject(new Error('[cypress] Timed out waiting for JOINED_GROUP event and active profile status'))
-          }, 5000)
+          }, 15000)
 
           const cID = await sbp('gi.app/group/createAndSwitch', {
             data: {
@@ -347,7 +354,14 @@ Cypress.Commands.add('giCreateGroup', (name, {
       }).then(() => {
         const router = sbp('controller/router')
         if (router.history.current.path === '/dashboard') return
-        return router.push({ path: '/dashboard' })
+        const state = sbp('state/vuex/state')
+        return sbp('gi.actions/identity/setGroupAttributes', {
+          contractID: state.loggedIn.identityContractID,
+          data: {
+            groupContractID: state.currentGroupId,
+            attributes: { seenWelcomeScreen: true }
+          }
+        }).then(() => router.push({ path: '/dashboard' }))
       })
     })
     cy.url().should('eq', `${API_URL}/app/dashboard`)