diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx index 41681f52a2b71a147b3201682ebd8ea4f1b0442a..dbe071720132403ca6d0197190bfca46c84b42b0 100644 --- a/src/components/Analysis/MonthlyAnalysis.tsx +++ b/src/components/Analysis/MonthlyAnalysis.tsx @@ -31,7 +31,7 @@ const MonthlyAnalysis = ({ const { analysis: { analysisMonth, haveSeenNewsletterReminder }, global: { fluidStatus }, - profile: { sendAnalysisNotification, newsletterReminderEnabled }, + profile: { sendAnalysisNotification, isAnalysisReminderEnabled }, } = useAppSelector(state => state.ecolyo) const consumptionService = useMemo( @@ -65,7 +65,7 @@ const MonthlyAnalysis = ({ const displayNewsletterReminder = !sendAnalysisNotification && - newsletterReminderEnabled && + isAnalysisReminderEnabled && !haveSeenNewsletterReminder useEffect(() => { diff --git a/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx b/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx index 4b41d5afcf128f623ac9b2ed4abfb7dcbd3ae353..92d0c30dfc7bf9ba83150225198809bf0e28fa64 100644 --- a/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx +++ b/src/components/Analysis/NewsletterReminder/NewsletterReminder.tsx @@ -45,7 +45,7 @@ const NewsletterReminder = () => { }} size="small" onClick={() => - dispatch(updateProfile({ newsletterReminderEnabled: false })) + dispatch(updateProfile({ isAnalysisReminderEnabled: false })) } > {t('analysis.newsletter_reminder.stop_showing')} diff --git a/src/db/profileData.ts b/src/db/profileData.ts index 9230d0ef153aa7c1c6a794a057299431e9242acd..e045626a4857bb80e5da8c779f4c60c79d82ec6e 100644 --- a/src/db/profileData.ts +++ b/src/db/profileData.ts @@ -9,23 +9,23 @@ const profileData: Omit<ProfileEntity, 'id'> = { explorationHash: '', haveSeenEcogestureModal: false, haveSeenLastAnalysis: true, + isAnalysisReminderEnabled: true, isFirstConnection: true, isProfileEcogestureCompleted: false, isProfileTypeCompleted: false, lastConnectionDate: '0000-01-01T00:00:00.000Z', mailToken: '', monthlyAnalysisDate: '0000-01-01T00:00:00.000Z', + onboarding: { + isWelcomeSeen: false, + }, partnersIssueSeenDate: { enedis: '0000-01-01T00:00:00.000Z', egl: '0000-01-01T00:00:00.000Z', grdf: '0000-01-01T00:00:00.000Z', }, quizHash: '', - onboarding: { - isWelcomeSeen: false, - }, sendAnalysisNotification: false, - newsletterReminderEnabled: true, sendConsumptionAlert: false, waterDailyConsumptionLimit: 0, } diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts index a0c299dcd7c12a5c797a8d86de4d0027baae1621..45dc38472c502ef7b50b720863b44fd9b2df7fa4 100644 --- a/src/migrations/migration.data.ts +++ b/src/migrations/migration.data.ts @@ -619,12 +619,12 @@ export const migrations: Migration[] = [ baseSchemaVersion: 24, targetSchemaVersion: 25, appVersion: '3.1.0', - description: 'Initialize newsletterReminderEnabled in profile', + description: 'Initialize isAnalysisReminderEnabled in profile', releaseNotes: null, docTypes: PROFILE_DOCTYPE, run: async (_client: Client, docs: Profile[]): Promise<Profile[]> => { return docs.map(doc => { - doc.newsletterReminderEnabled = true + doc.isAnalysisReminderEnabled = true return doc }) }, diff --git a/src/models/profile.model.ts b/src/models/profile.model.ts index f23edd8b6ccd30b395929982afd47ed6b1df7ad3..0b0abd58b8f62f998260e44b19df0ebbc18a70df 100644 --- a/src/models/profile.model.ts +++ b/src/models/profile.model.ts @@ -15,7 +15,7 @@ export interface ProfileEntity { lastConnectionDate: string haveSeenLastAnalysis: boolean sendAnalysisNotification: boolean - newsletterReminderEnabled: boolean + isAnalysisReminderEnabled: boolean monthlyAnalysisDate: string sendConsumptionAlert: boolean waterDailyConsumptionLimit: number