chore: sync master with develop

chore: sync master with develop

package.json

@@ -26,7 +26,7 @@
     "@graphql-codegen/typescript-operations": "^3.0.3",
     "@hypha-dao/hypha-token-sales-util": "^1.0.1",
     "@hypha-dao/ppp-client-api": "1.0.3",
-    "@hypha-dao/ual-hypha": "^1.0.11",
+    "@hypha-dao/ual-hypha": "^1.0.12",
     "@quasar/extras": "1.10.4",
     "@sentry/browser": "6.3.1",
     "@sentry/integrations": "6.3.1",

src/components/login/login-view.vue

@@ -56,7 +56,7 @@ export default {
           this.$emit('transitionToRegister')
         }
       } else {
-        await this.loginWallet({ idx, returnUrl: this.isOnboarding ? 'create' : this.$route.query.returnUrl || 'home' })
+        await this.loginWallet({ idx, returnUrl: this.isOnboarding ? 'create' : this.$route.query.returnUrl || '/' })
       }
     },
     async onLoginInApp () {
@@ -66,7 +66,7 @@ export default {
       this.submitting = true
       this.errorPrivateKey = await this.loginInApp({
         ...this.form,
-        returnUrl: this.isOnboarding ? 'create' : this.$route.query.returnUrl || 'home'
+        returnUrl: this.isOnboarding ? 'create' : this.$route.query.returnUrl || '/'
       })
       this.submitting = false
     },

src/layouts/Layout.vue

@@ -136,6 +136,8 @@ const ACTIVE_PLAN_QUERY = `
     price
     id: planId
     name: planName
+    planType
+    interval
   }
 `
 
@@ -169,7 +171,7 @@ export default {
           isHypha: dao?.settings[0]?.settings_isHypha_i || ''
         }
       },
-      skip () { return !this.dhoname || ['create-your-dao', 'login'].includes(this.$route.name) ? '' : !this.account },
+      skip () { return !this.dhoname || this.isAuthenticated ? !this.account : '' },
       variables () { return { regexp: '/^' + this.dhoname + '$/i', username: this.account } },
       async result (res) {
         this.state = STATE.LOADING
@@ -217,7 +219,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters('accounts', ['account']),
+    ...mapGetters('accounts', ['account', 'isAuthenticated']),
 
     layout () { return this.$route?.meta?.layout || 'multi-dho-layout' }
   },

src/pages/proposals/ProposalDetail.vue

@@ -1080,7 +1080,7 @@ export default {
       variables () { return { docId: this.docId } },
       fetchPolicy: 'no-cache',
 
-      pollInterval: 1000, // TODO: Swap with subscribe once dgraph is ready
+      // pollInterval: 1000, // TODO: Swap with subscribe once dgraph is ready
       // subscribeToMore: {
       //   document: gql`subscription proposalDetail($docId: String!) { ${PROPOSAL_QUERY} }`,
       //   skip () { return !this.docId },

src/pages/proposals/ProposalList.vue

@@ -400,8 +400,8 @@ export default {
           user: this.account
         }
       },
-      fetchPolicy: 'no-cache',
-      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
+      fetchPolicy: 'no-cache'
+      // pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
       // subscribeToMore: {
       //   document: require('~/query/proposals/dao-proposals-active-vote-subs.gql'),
       //   variables () {
@@ -436,8 +436,8 @@ export default {
           user: this.account
         }
       },
-      fetchPolicy: 'no-cache',
-      pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
+      fetchPolicy: 'no-cache'
+      // pollInterval: 1000 // TODO: Swap with subscribe once dgraph is ready
       // subscribeToMore: {
       //   document: gql`subscription stageProposals($docId: String!, $first: Int, $offset: Int) { ${STAGED_PROPOSALS_QUERY} }`,
       //   skip () { return !this.selectedDao?.docId },

src/store/accounts/actions.js

@@ -1,6 +1,7 @@
 import { Api, JsonRpc } from 'eosjs'
 import { JsSignatureProvider } from 'eosjs/dist/eosjs-jssig'
 import { MEMBER_TYPE } from '~/const'
+import { Screen } from 'quasar'
 import gql from 'graphql-tag'
 
 export const lightWalletLogin = async function ({ commit, dispatch }, { returnUrl }) {
@@ -26,8 +27,25 @@ export const loginWallet = async function ({ commit, dispatch }, { idx, returnUr
   await authenticator.init()
   let error
   let account
+  let users = null
   try {
-    const users = await authenticator.login()
+    if (authenticator.ualName === 'hypha') {
+      let options = {}
+      if (Screen.gt.md) {
+        options = {
+          text: 'Scan the QR-code with Hypha Wallet on your mobile device in order to sign this transaction request',
+          actionText: 'Launch On Desktop'
+        }
+      } else {
+        options = {
+          text: 'Click this button to open Hypha Wallet on your mobile device and sign this transaction',
+          actionText: 'Open in Hypha Wallet'
+        }
+      }
+      users = await authenticator.login(options)
+    } else {
+      users = await authenticator.login()
+    }
     if (users.length) {
       account = users[0].accountName
       this.$ualUser = users[0]

src/store/dao/mutations.js

@@ -138,7 +138,7 @@ export const setPlan = (state, plan = {}) => {
     ...plan,
     name: (plan?.name || PLAN.FOUNDER).toLowerCase(),
     status: plan?.status || PLAN_STATUS.ACTIVE,
-    amountUSD: (plan?.price / 100) / 12,
+    amountUSD: (plan?.price / 100) / (plan.interval === 'year' && plan.planType === 'SAAS' ? 12 : 1),
     coreMembersCount: plan?.coreMembersCount || 5,
     communityMembersCount: plan?.communityMembersCount || 0,
     currentCoreMembersCount: state?.meta?.memberCount || 0