From a242100eb6f44355e4e0c58a60ef8f968df7b6e4 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 9 Jan 2025 10:27:02 -0800
Subject: [PATCH 01/39] initial use of formatDatum() method

---
 .../dashboard/PatientDrawer/CGMStatistics.js  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics.js b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
index 1e8ebfa8c0..089a5681cd 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
@@ -5,6 +5,7 @@ import { useSelector } from 'react-redux';
 import { Flex, Box, Text } from 'theme-ui';
 import moment from 'moment';
 import { utils as vizUtils } from '@tidepool/viz';
+const { formatDatum } = vizUtils.stat;
 import utils from '../../../core/utils';
 import { MGDL_UNITS } from '../../../core/constants';
 
@@ -56,7 +57,7 @@ const CGMStatistics = ({ agpCGM }) => {
 
   const {
     timePrefs,
-    bgPrefs: { bgUnits },
+    bgPrefs,
     data: {
       current: {
         endpoints: { days: endpointDays },
@@ -71,18 +72,21 @@ const CGMStatistics = ({ agpCGM }) => {
     }
   } = agpCGM;
 
+  const { bgUnits } = bgPrefs;
+
   const timezoneName = vizUtils.datetime.getTimezoneFromTimePrefs(timePrefs);
 
-  const avgGlucosePrecision = bgUnits === MGDL_UNITS ? 0 : 1;
-  const avgGlucoseTarget    = bgUnits === MGDL_UNITS ? '154' : '8.6';
+  const avgGlucoseTarget = bgUnits === MGDL_UNITS ? '154' : '8.6';
 
   const dateRange  = formatDateRange(oldestDatum.time, newestDatum.time, timezoneName);
   const daySpan    = endpointDays;
   const cgmActive  = utils.roundToPrecision(sensorUsageAGP, 1);
-  const avgGlucose = utils.roundToPrecision(averageGlucose, avgGlucosePrecision);
-  const gmi        = utils.roundToPrecision(glucoseManagementIndicatorAGP, 1);
+  
   const cov        = utils.roundToPrecision(coefficientOfVariation, 1);
 
+  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
+  const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', { bgPrefs, useAGPFormat: true });
+
   return (
     <Flex sx={{ alignItems: 'center', width: '100%', height: '100%' }} id='agp-cgm-statistics'>
       <Box sx={{ width: '100%' }}>
@@ -101,15 +105,15 @@ const CGMStatistics = ({ agpCGM }) => {
             id="agp-table-avg-glucose"
             label={t('Average Glucose')}
             sublabel={t('(Goal <{{avgGlucoseTarget}} {{bgUnits}})', { avgGlucoseTarget, bgUnits })}
-            value={`${avgGlucose}`}
+            value={avgGlucose.value}
             units={` ${bgUnits}`}
           />
           <TableRow
             id="agp-table-gmi"
             label={t('Glucose Management Indicator')}
             sublabel={t('(Goal <7%)')}
-            value={`${gmi}`}
-            units="%"
+            value={gmi?.value}
+            units={gmi?.suffix}
           />
           <TableRow
             id="agp-table-cov"

From e9a806be464ade6269b488da2fb47323f87f996c Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 9 Jan 2025 10:41:37 -0800
Subject: [PATCH 02/39] abstract out formattingOpts

---
 app/pages/dashboard/PatientDrawer/CGMStatistics.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics.js b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
index 089a5681cd..bd06872990 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
@@ -84,8 +84,10 @@ const CGMStatistics = ({ agpCGM }) => {
   
   const cov        = utils.roundToPrecision(coefficientOfVariation, 1);
 
-  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
-  const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', { bgPrefs, useAGPFormat: true });
+  const formattingOpts = { bgPrefs, useAGPFormat: true }
+
+  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', formattingOpts);
+  const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', formattingOpts);
 
   return (
     <Flex sx={{ alignItems: 'center', width: '100%', height: '100%' }} id='agp-cgm-statistics'>

From 1a69686295895ff4c49e53a0ee6c19585f4eec5d Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 9 Jan 2025 23:07:10 -0800
Subject: [PATCH 03/39] use bankersRound for cgmActive

---
 app/pages/dashboard/PatientDrawer/CGMStatistics.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics.js b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
index bd06872990..c531082251 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics.js
@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { Flex, Box, Text } from 'theme-ui';
 import moment from 'moment';
 import { utils as vizUtils } from '@tidepool/viz';
-const { formatDatum } = vizUtils.stat;
+const { formatDatum, bankersRound } = vizUtils.stat;
 import utils from '../../../core/utils';
 import { MGDL_UNITS } from '../../../core/constants';
 
@@ -80,14 +80,13 @@ const CGMStatistics = ({ agpCGM }) => {
 
   const dateRange  = formatDateRange(oldestDatum.time, newestDatum.time, timezoneName);
   const daySpan    = endpointDays;
-  const cgmActive  = utils.roundToPrecision(sensorUsageAGP, 1);
-  
-  const cov        = utils.roundToPrecision(coefficientOfVariation, 1);
 
   const formattingOpts = { bgPrefs, useAGPFormat: true }
 
+  const cgmActive  = bankersRound(sensorUsageAGP, 1);
   const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', formattingOpts);
   const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', formattingOpts);
+  const cov        = formatDatum({ value: coefficientOfVariation }, 'cv', formattingOpts);
 
   return (
     <Flex sx={{ alignItems: 'center', width: '100%', height: '100%' }} id='agp-cgm-statistics'>
@@ -121,8 +120,8 @@ const CGMStatistics = ({ agpCGM }) => {
             id="agp-table-cov"
             label={t('Glucose Variability')}
             sublabel={t('(Defined as a percent coefficient of variation. Goal <= 36%)')}
-            value={`${cov}`}
-            units="%"
+            value={cov?.value}
+            units={cov?.suffix}
           />
       </Box>
     </Flex>

From e4ac1523a2efdc0f23a7c3573951ea045ddf9612 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Fri, 10 Jan 2025 10:44:17 -0800
Subject: [PATCH 04/39] utilise methods in AGP Report View for report days text

---
 .../CGMStatistics/getReportDaysText.js        | 41 +++++++++++++++++++
 .../index.js}                                 | 25 +++--------
 2 files changed, 46 insertions(+), 20 deletions(-)
 create mode 100644 app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
 rename app/pages/dashboard/PatientDrawer/{CGMStatistics.js => CGMStatistics/index.js} (80%)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
new file mode 100644
index 0000000000..c89fc03d06
--- /dev/null
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
@@ -0,0 +1,41 @@
+import moment from 'moment';
+import { MS_IN_MIN } from '../../../../core/constants';
+import isNumber from 'lodash/isNumber';
+import { utils as vizUtils } from '@tidepool/viz';
+const { getOffset } = vizUtils.datetime;
+
+export const formatDateRange = (startDate, endDate, dateParseFormat, monthFormat = 'MMM') => {
+  const start = moment.utc(startDate, dateParseFormat);
+  const end = moment.utc(endDate, dateParseFormat);
+
+  const isSameYear = start.isSame(end, 'year');
+  const isSameDay = start.isSame(end, 'day');
+  const startFormat = isSameYear ? start.format(`${monthFormat} D`) : start.format(`${monthFormat} D, YYYY`);
+  const endFormat = end.format(`${monthFormat} D, YYYY`);
+
+  const formattedRange = isSameDay ? endFormat : `${startFormat} - ${endFormat}`;
+
+  return formattedRange;
+};
+
+const getDateRange = (startDate, endDate, dateParseFormat, _prefix, monthFormat, timezone) => {
+  let start = startDate;
+  let end = endDate;
+
+  if (isNumber(startDate) && isNumber(endDate)) {
+    start = startDate - getOffset(startDate, timezone) * MS_IN_MIN;
+    end = endDate - getOffset(endDate, timezone) * MS_IN_MIN;
+  }
+
+  return formatDateRange(start, end, dateParseFormat, monthFormat);
+};
+
+const getReportDaysText = (newestDatum, oldestDatum, bgDaysWorn, timezone) => {
+  const reportDaysText = bgDaysWorn === 1
+    ? moment.utc(newestDatum?.time - getOffset(newestDatum?.time, timezone) * MS_IN_MIN).format('MMMM D, YYYY')
+    : getDateRange(oldestDatum?.time, newestDatum?.time, undefined, '', 'MMMM', timezone);
+
+  return reportDaysText;
+};
+
+export default getReportDaysText;
\ No newline at end of file
diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
similarity index 80%
rename from app/pages/dashboard/PatientDrawer/CGMStatistics.js
rename to app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
index c531082251..d0c108b1c9 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
@@ -1,26 +1,11 @@
 import React from 'react';
-import colorPalette from '../../../themes/colorPalette';
+import colorPalette from '../../../../themes/colorPalette';
 import { useTranslation } from 'react-i18next';
-import { useSelector } from 'react-redux';
 import { Flex, Box, Text } from 'theme-ui';
-import moment from 'moment';
 import { utils as vizUtils } from '@tidepool/viz';
 const { formatDatum, bankersRound } = vizUtils.stat;
-import utils from '../../../core/utils';
-import { MGDL_UNITS } from '../../../core/constants';
-
-const formatDateRange = (startEndpoint, endEndpoint, timezoneName) => {
-  const startDate = moment.utc(startEndpoint).tz(timezoneName);
-  const endDate   = moment.utc(endEndpoint).tz(timezoneName);
-  const startYear = startDate.year();
-  const endYear   = endDate.year();
-
-  if (startYear !== endYear) {
-    return `${startDate.format('MMMM D, YYYY')} - ${endDate.format('MMMM D, YYYY')}`;
-  }
-
-  return `${startDate.format('MMMM D')} - ${endDate.format('MMMM D')}, ${endDate.format('YYYY')}`;
-}
+import { MGDL_UNITS } from '../../../../core/constants';
+import getReportDaysText from './getReportDaysText';
 
 const TableRow = ({ label, sublabel, value, units, id }) => {
   return (
@@ -62,7 +47,7 @@ const CGMStatistics = ({ agpCGM }) => {
       current: {
         endpoints: { days: endpointDays },
         stats: {
-          bgExtents: { newestDatum, oldestDatum },
+          bgExtents: { newestDatum, oldestDatum, bgDaysWorn },
           sensorUsage: { sensorUsageAGP },
           averageGlucose: { averageGlucose },
           glucoseManagementIndicator: { glucoseManagementIndicatorAGP },
@@ -78,11 +63,11 @@ const CGMStatistics = ({ agpCGM }) => {
 
   const avgGlucoseTarget = bgUnits === MGDL_UNITS ? '154' : '8.6';
 
-  const dateRange  = formatDateRange(oldestDatum.time, newestDatum.time, timezoneName);
   const daySpan    = endpointDays;
 
   const formattingOpts = { bgPrefs, useAGPFormat: true }
 
+  const dateRange  = getReportDaysText(newestDatum, oldestDatum, bgDaysWorn, timezoneName);
   const cgmActive  = bankersRound(sensorUsageAGP, 1);
   const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', formattingOpts);
   const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', formattingOpts);

From 047e759145d8966c6e16262eab445fc63c5fe6cf Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Fri, 10 Jan 2025 10:50:50 -0800
Subject: [PATCH 05/39] cleanup: remove unused destructured vars

---
 .../CGMStatistics/getReportDaysText.js        |  2 +-
 .../PatientDrawer/CGMStatistics/index.js      | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
index c89fc03d06..f72dddef14 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
@@ -4,7 +4,7 @@ import isNumber from 'lodash/isNumber';
 import { utils as vizUtils } from '@tidepool/viz';
 const { getOffset } = vizUtils.datetime;
 
-export const formatDateRange = (startDate, endDate, dateParseFormat, monthFormat = 'MMM') => {
+const formatDateRange = (startDate, endDate, dateParseFormat, monthFormat = 'MMM') => {
   const start = moment.utc(startDate, dateParseFormat);
   const end = moment.utc(endDate, dateParseFormat);
 
diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
index d0c108b1c9..6277f62347 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { Flex, Box, Text } from 'theme-ui';
 import { utils as vizUtils } from '@tidepool/viz';
 const { formatDatum, bankersRound } = vizUtils.stat;
+const { getTimezoneFromTimePrefs } = vizUtils.datetime;
 import { MGDL_UNITS } from '../../../../core/constants';
 import getReportDaysText from './getReportDaysText';
 
@@ -45,33 +46,28 @@ const CGMStatistics = ({ agpCGM }) => {
     bgPrefs,
     data: {
       current: {
-        endpoints: { days: endpointDays },
         stats: {
           bgExtents: { newestDatum, oldestDatum, bgDaysWorn },
           sensorUsage: { sensorUsageAGP },
           averageGlucose: { averageGlucose },
           glucoseManagementIndicator: { glucoseManagementIndicatorAGP },
-          coefficientOfVariation: { coefficientOfVariation }
+          coefficientOfVariation: { coefficientOfVariation },
         },
       }
-    }
+    },
   } = agpCGM;
 
   const { bgUnits } = bgPrefs;
 
-  const timezoneName = vizUtils.datetime.getTimezoneFromTimePrefs(timePrefs);
+  const timezone = getTimezoneFromTimePrefs(timePrefs);
 
   const avgGlucoseTarget = bgUnits === MGDL_UNITS ? '154' : '8.6';
 
-  const daySpan    = endpointDays;
-
-  const formattingOpts = { bgPrefs, useAGPFormat: true }
-
-  const dateRange  = getReportDaysText(newestDatum, oldestDatum, bgDaysWorn, timezoneName);
+  const dateRange  = getReportDaysText(newestDatum, oldestDatum, bgDaysWorn, timezone);
   const cgmActive  = bankersRound(sensorUsageAGP, 1);
-  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', formattingOpts);
-  const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', formattingOpts);
-  const cov        = formatDatum({ value: coefficientOfVariation }, 'cv', formattingOpts);
+  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
+  const gmi        = formatDatum({ value: glucoseManagementIndicatorAGP }, 'gmi', { bgPrefs, useAGPFormat: true });
+  const cov        = formatDatum({ value: coefficientOfVariation }, 'cv', { bgPrefs, useAGPFormat: true });
 
   return (
     <Flex sx={{ alignItems: 'center', width: '100%', height: '100%' }} id='agp-cgm-statistics'>
@@ -79,7 +75,7 @@ const CGMStatistics = ({ agpCGM }) => {
           <TableRow
             id="agp-table-time-range"
             label={t('Time Range')}
-            value={t('{{dateRange}} ({{daySpan}} days)', { dateRange, daySpan })}
+            value={t('{{dateRange}} ({{bgDaysWorn}} days)', { dateRange, bgDaysWorn })}
           />
           <TableRow
             id="agp-table-cgm-active"

From 40a0c522cea504b2cb65ba35615bdc9b8ac8689d Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Fri, 10 Jan 2025 20:59:55 +0100
Subject: [PATCH 06/39] fix time zone discrepancy

---
 .../dashboard/PatientDrawer/useAgpCGM/getOpts.js   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
index 13b543dca3..11323d0d5e 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
@@ -2,6 +2,7 @@ import moment from 'moment-timezone';
 import _ from 'lodash';
 import get from 'lodash/get';
 import { utils as vizUtils } from '@tidepool/viz';
+import utils from '../../../../core/utils';
 
 const getTimezoneFromTimePrefs = vizUtils.datetime.getTimezoneFromTimePrefs;
 
@@ -39,7 +40,16 @@ const getOpts = (
     agpCGM: getMostRecentDatumTimeByChartType(data, 'agpCGM'),
   };
 
-  const timezoneName = getTimezoneFromTimePrefs(data?.timePrefs);
+  const timePrefs = (() => {
+    const latestTimeZone = data?.metaData?.latestTimeZone;
+    const queryParams = {};
+
+    const localTimePrefs = utils.getTimePrefsForDataProcessing(latestTimeZone, queryParams);
+    
+    return localTimePrefs;
+  })()
+
+  const timezoneName = getTimezoneFromTimePrefs(timePrefs);
 
   const endOfToday = moment.utc().tz(timezoneName).endOf('day').subtract(1, 'ms');
 
@@ -68,6 +78,8 @@ const getOpts = (
 
   const dates = defaultDates();
 
+  console.log('useAgpCGM dates', dates);
+
   const formatDateEndpoints = ({ startDate, endDate }) => (startDate && endDate ? [
     startDate.valueOf(),
     moment.utc(endDate).tz(timezoneName).add(1, 'day').startOf('day').valueOf(),

From 788f6f0e5a0e098ad9782bbb396b92b2e4887b82 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Fri, 10 Jan 2025 22:11:01 +0100
Subject: [PATCH 07/39] remove console.log

---
 app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
index 11323d0d5e..8449ff7ce0 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
@@ -78,8 +78,6 @@ const getOpts = (
 
   const dates = defaultDates();
 
-  console.log('useAgpCGM dates', dates);
-
   const formatDateEndpoints = ({ startDate, endDate }) => (startDate && endDate ? [
     startDate.valueOf(),
     moment.utc(endDate).tz(timezoneName).add(1, 'day').startOf('day').valueOf(),

From 6c2d6c05ef02b7efdd7334f77419f1c9d6b05ab6 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Fri, 10 Jan 2025 14:34:37 -0800
Subject: [PATCH 08/39] use safe navigation for avgGlucose.value

---
 app/pages/dashboard/PatientDrawer/CGMStatistics/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
index 6277f62347..b99e8b8d59 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
@@ -87,7 +87,7 @@ const CGMStatistics = ({ agpCGM }) => {
             id="agp-table-avg-glucose"
             label={t('Average Glucose')}
             sublabel={t('(Goal <{{avgGlucoseTarget}} {{bgUnits}})', { avgGlucoseTarget, bgUnits })}
-            value={avgGlucose.value}
+            value={avgGlucose?.value}
             units={` ${bgUnits}`}
           />
           <TableRow

From 249dc0eb443047aa5a788463f81f9ed3cd451b11 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 09:01:31 -0800
Subject: [PATCH 09/39] check data sufficiency for clipboard using count *
 sampleFrequency

---
 .../MenuBar/CGMClipboardButton.js             | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 549b454655..f04360f978 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -2,7 +2,7 @@ import React, { useEffect, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import Button from '../../../../components/elements/Button';
 import utils from '../../../../core/utils';
-import { MGDL_UNITS } from '../../../../core/constants';
+import { MGDL_UNITS, MS_IN_HOUR } from '../../../../core/constants';
 import { utils as vizUtils } from '@tidepool/viz';
 const { TextUtil } = vizUtils.text;
 import { Box } from 'theme-ui'
@@ -19,7 +19,7 @@ const formatDateRange = (startEndpoint, endEndpoint, timezoneName) => {
   }
 
   return `${startDate.format('MMMM D')} - ${endDate.format('MMMM D')}, ${endDate.format('YYYY')}`;
-}
+};
 
 const getCGMClipboardText = (patient, agpCGM, t) => {
   if (!agpCGM || !patient) return '';
@@ -36,8 +36,8 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
           averageGlucose: { averageGlucose },
           timeInRange: { counts },
         },
-      }
-    }
+      },
+    },
   } = agpCGM;
 
   const timezoneName = vizUtils.datetime.getTimezoneFromTimePrefs(timePrefs);
@@ -74,37 +74,37 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   clipboardText += textUtil.buildTextLine(t('Avg. Glucose (CGM): {{avgGlucose}} {{bgUnits}}', { avgGlucose, bgUnits }));
 
   return clipboardText;
-}
+};
 
 const STATE = {
   DEFAULT: 'DEFAULT',
   CLICKED: 'CLICKED',
-}
+};
 
 const CGMClipboardButton = ({ patient, agpCGM }) => {
   const { t } = useTranslation();
   const [buttonState, setButtonState] = useState(STATE.DEFAULT);
+  const clipboardText = useMemo(() => getCGMClipboardText(patient, agpCGM, t), [patient, agpCGM, t]);
 
   useEffect(() => {
     let buttonTextEffect = setTimeout(() => {
-      setButtonState(STATE.DEFAULT)
+      setButtonState(STATE.DEFAULT);
     }, 1000);
 
     return () => {
       clearTimeout(buttonTextEffect);
-    }
-  }, [buttonState])
+    };
+  }, [buttonState]);
 
-  const sensorUsage = agpCGM?.data?.current?.stats?.sensorUsage?.sensorUsage || 0;
+  const { count, sampleFrequency } = agpCGM?.data?.current?.stats?.sensorUsage || {};
 
-  const isDisabled = !agpCGM || sensorUsage < 86400000; // minimum 24 hours
-
-  const clipboardText = useMemo(() => getCGMClipboardText(patient, agpCGM, t), [patient, agpCGM, t]);
+  const isDataInsufficient = ((count * sampleFrequency) / MS_IN_HOUR) < 24; // minimum 24 hours
+  const isDisabled = !agpCGM || isDataInsufficient;
 
   const handleCopy = () => {
     navigator?.clipboard?.writeText(clipboardText);
     setButtonState(STATE.CLICKED);
-  }
+  };
 
   return (
     <Button disabled={isDisabled} onClick={handleCopy} variant="secondary">
@@ -113,7 +113,7 @@ const CGMClipboardButton = ({ patient, agpCGM }) => {
         : <Box>{t('Copy as Text')}</Box>
       }
     </Button>
-  )
-}
+  );
+};
 
 export default CGMClipboardButton;
\ No newline at end of file

From 7e8439d80fec96d5569d382bc6ec32a3631ce748 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 09:21:51 -0800
Subject: [PATCH 10/39] clean up clipboard conditions

---
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index f04360f978..45bfa21167 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -98,8 +98,9 @@ const CGMClipboardButton = ({ patient, agpCGM }) => {
 
   const { count, sampleFrequency } = agpCGM?.data?.current?.stats?.sensorUsage || {};
 
-  const isDataInsufficient = ((count * sampleFrequency) / MS_IN_HOUR) < 24; // minimum 24 hours
-  const isDisabled = !agpCGM || isDataInsufficient;
+  const hoursOfCGMData = count * sampleFrequency;
+
+  const isDataInsufficient = !hoursOfCGMData || ((hoursOfCGMData / MS_IN_HOUR) < 24); // minimum 24 hours
 
   const handleCopy = () => {
     navigator?.clipboard?.writeText(clipboardText);
@@ -107,7 +108,7 @@ const CGMClipboardButton = ({ patient, agpCGM }) => {
   };
 
   return (
-    <Button disabled={isDisabled} onClick={handleCopy} variant="secondary">
+    <Button disabled={isDataInsufficient} onClick={handleCopy} variant="secondary">
       {buttonState === STATE.CLICKED 
         ? <Box>{t('Copied ✓')}</Box> 
         : <Box>{t('Copy as Text')}</Box>

From fad8c1f445462d19dc0f03247c43afe51a2ab486 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 10:19:42 -0800
Subject: [PATCH 11/39] fix CGMStatistics test

---
 .../PatientDrawer/CGMStatistics.test.js       | 144 ++++++++++++------
 1 file changed, 96 insertions(+), 48 deletions(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js
index b395364cbd..51c0da8616 100644
--- a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js
@@ -19,70 +19,118 @@ const agpCGM = {
     'current': {
       'aggregationsByDate': {},
       'stats': {
-        'averageGlucose': {
-          'averageGlucose': 121.24147339699863,
-          'total': 733
+        'averageGlucose': { 
+          'averageGlucose': 121.4013071783735, 
+          'total': 8442,
         },
         'bgExtents': {
-          'bgMax': 350,
-          'bgMin': 39,
-          'bgDaysWorn': 7,
-          'newestDatum': { 'time': 1733164212000 },
-          'oldestDatum': { 'time': 1732608015000 }
+          'bgMax': 401.00001001500004,
+          'bgMin': 38.9999690761,
+          'bgDaysWorn': 30,
+          'newestDatum': { 'time': 1736783190269 },
+          'oldestDatum': { 'time': 1734249705225 },
         },
-        'coefficientOfVariation': {
-          'coefficientOfVariation': 49.838071869255685,
-          'total': 733
+        'coefficientOfVariation': { 
+          'coefficientOfVariation': 49.82047988955789, 
+          'total': 8442,
         },
         'glucoseManagementIndicator': {
-          'glucoseManagementIndicator': null,
-          'glucoseManagementIndicatorAGP': 6.210096043656208,
-          'insufficientData': true
+          'glucoseManagementIndicator': 6.236871267706695,
+          'glucoseManagementIndicatorAGP': 6.236871267706695,
+          'total': 8442,
         },
         'sensorUsage': {
-          'sensorUsage': 219900000,
-          'sensorUsageAGP': 39.514824797843666,
-          'total': 604800000,
+          'sensorUsage': 2532600000,
+          'sensorUsageAGP': 99.95264030310206,
+          'total': 2592000000,
           'sampleFrequency': 300000,
-          'count': 733
+          'count': 8442,
         },
         'timeInRange': {
           'durations': {
-            'veryLow': 5186357.435197817,
-            'low': 12376534.788540244,
-            'target': 56106957.70804911,
-            'high': 8368894.952251023,
-            'veryHigh': 4361255.115961801,
-            'total': 219900000
+            'veryLow': 337739.8720682303,
+            'low': 2507462.686567164,
+            'target': 66023027.7185501,
+            'high': 14031556.503198294,
+            'veryHigh': 3500213.219616205,
+            'total': 2532600000,
           },
           'counts': {
-            'veryLow': 44,
-            'low': 105,
-            'target': 476,
-            'high': 71,
-            'veryHigh': 37,
-            'total': 733
-          }
-        }
+            'veryLow': 33,
+            'low': 245,
+            'target': 6451,
+            'high': 1371,
+            'veryHigh': 342,
+            'total': 8442,
+          },
+        },
       },
       'endpoints': {
-        'range': [
-          1732608000000,
-          1733212800000
-        ],
-        'days': 7,
-        'activeDays': 7
-      }
-    }
-  },
-  'timePrefs': {
-    'timezoneAware': true,
-    'timezoneName': 'US/Eastern'
+        'range': [1734249600000, 1736841600000 ],
+        'days': 30,
+        'activeDays': 30,
+      },
+      'data': {},
+    },
   },
+  'timePrefs': { 'timezoneAware': true, 'timezoneName': 'Etc/GMT+8' },
   'bgPrefs': {
-    'bgUnits': 'mg/dL'
+    'bgBounds': {
+      'veryHighThreshold': 250,
+      'targetUpperBound': 180,
+      'targetLowerBound': 70,
+      'veryLowThreshold': 54,
+      'extremeHighThreshold': 350,
+      'clampThreshold': 600,
+    },
+    'bgClasses': {
+      'low': { 'boundary': 70 },
+      'target': { 'boundary': 180 },
+      'very-low': { 'boundary': 54 },
+      'high': { 'boundary': 250 },
+    },
+    'bgUnits': 'mg/dL',
+  },
+  'query': {
+    'endpoints': [
+      1734249600000,
+      1736841600000,
+    ],
+    'aggregationsByDate': 'dataByDate, statsByDate',
+    'bgSource': 'cbg',
+    'stats': [
+      'averageGlucose',
+      'bgExtents',
+      'coefficientOfVariation',
+      'glucoseManagementIndicator',
+      'sensorUsage',
+      'timeInRange',
+    ],
+    'types': { 'cbg': {} },
+    'bgPrefs': {
+      'bgUnits': 'mg/dL',
+      'bgClasses': { 
+        'low': { 'boundary': 70 }, 
+        'target': { 'boundary': 180 }, 
+        'very-low': { 'boundary': 54 }, 
+        'high': { 'boundary': 250 },
+      },
+      'bgBounds': {
+        'veryHighThreshold': 250,
+        'targetUpperBound': 180,
+        'targetLowerBound': 70,
+        'veryLowThreshold': 54,
+        'extremeHighThreshold': 350,
+        'clampThreshold': 600,
+      },
+    },
+    'metaData': 'latestPumpUpload, bgSources',
+    'timePrefs': {
+      'timezoneAware': true,
+      'timezoneName': 'Etc/GMT+8',
+    },
+    'excludedDevices': [],
   },
-  'query': {},
   'metaData': {},
 };
 
@@ -99,11 +147,11 @@ describe('PatientDrawer/CGMStatistics', () => {
     const wrapper = mount(<CGMStatistics agpCGM={agpCGM} />);
 
     it('renders the time range in the expected format', () => {
-      expect(wrapper.find('#agp-table-time-range').hostNodes().text()).to.include('November 26 - December 2, 2024 (7 days)');
+      expect(wrapper.find('#agp-table-time-range').hostNodes().text()).to.include('December 15, 2024 - January 13, 2025 (30 days)');
     });
 
     it('renders the CGM Active % in the expected format', () => {
-      expect(wrapper.find('#agp-table-cgm-active').hostNodes().text()).to.include('39.5%');
+      expect(wrapper.find('#agp-table-cgm-active').hostNodes().text()).to.include('100%');
     });
 
     it('renders the Average Glucose in the expected format', () => {

From ee8d78953bca557d13aae619a9726826429207ec Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 11:14:26 -0800
Subject: [PATCH 12/39] use bgPrefs for determining target ranges

---
 .../MenuBar/CGMClipboardButton.js             | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 45bfa21167..ca1d9a1d34 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -5,7 +5,8 @@ import utils from '../../../../core/utils';
 import { MGDL_UNITS, MS_IN_HOUR } from '../../../../core/constants';
 import { utils as vizUtils } from '@tidepool/viz';
 const { TextUtil } = vizUtils.text;
-import { Box } from 'theme-ui'
+const { formatPercentage, formatDatum } = vizUtils.stat;
+import { Box } from 'theme-ui';
 import moment from 'moment';
 
 const formatDateRange = (startEndpoint, endEndpoint, timezoneName) => {
@@ -28,7 +29,7 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
 
   const {
     timePrefs,
-    bgPrefs: { bgUnits },
+    bgPrefs,
     data: {
       current: {
         stats: {
@@ -40,22 +41,24 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
     },
   } = agpCGM;
 
+  const { bgUnits, bgBounds } = bgPrefs || {};
+  const { targetUpperBound, targetLowerBound, veryLowThreshold } = bgBounds || {};
+
   const timezoneName = vizUtils.datetime.getTimezoneFromTimePrefs(timePrefs);
 
   const currentDate = moment().format('MMMM Do, YYYY');
 
-  // TODO: Add test for no data scenario
   const dateRange = formatDateRange(oldestDatum?.time, newestDatum?.time, timezoneName);
 
-  const targetRange  = bgUnits === MGDL_UNITS ? '70-180' : '3.9-10.0';
-  const lowRange     = bgUnits === MGDL_UNITS ? '54-70' : '3.0-3.9';
-  const veryLowRange = bgUnits === MGDL_UNITS ? '<54' : '<3.0';
+  const targetRange  = `${targetLowerBound}-${targetUpperBound}`;
+  const lowRange     = `${veryLowThreshold}-${targetLowerBound}`;
+  const veryLowRange = `<${veryLowThreshold}`;
   
-  const countsInTarget  = utils.roundToPrecision((counts.target / counts.total) * 100, 0);
-  const countsInLow     = utils.roundToPrecision((counts.low * 100 ) / counts.total, 0);
-  const countsInVeryLow = utils.roundToPrecision((counts.veryLow * 100 ) / counts.total, 0);
+  const percentInTarget  = formatPercentage((counts.target / counts.total) * 100, 0, true);
+  const percentInLow     = formatPercentage((counts.low * 100 ) / counts.total, 0, true);
+  const percentInVeryLow = formatPercentage((counts.veryLow * 100 ) / counts.total, 0, true);
 
-  const avgGlucose   = utils.roundToPrecision(averageGlucose, bgUnits === MGDL_UNITS ? 0 : 1);
+  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
 
   const textUtil = new TextUtil();
   let clipboardText = '';
@@ -67,9 +70,9 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   clipboardText += textUtil.buildTextLine(t('Reporting Period: {{dateRange}}', { dateRange }));
   clipboardText += textUtil.buildTextLine('');
   clipboardText += textUtil.buildTextLine(t('Avg. Daily Time In Range ({{bgUnits}})', { bgUnits }));
-  clipboardText += textUtil.buildTextLine(t('{{targetRange}} {{countsInTarget}}%', { targetRange, countsInTarget }));
-  clipboardText += textUtil.buildTextLine(t('{{lowRange}} {{countsInLow}}%', { lowRange, countsInLow }));
-  clipboardText += textUtil.buildTextLine(t('{{veryLowRange}} {{countsInVeryLow}}%', { veryLowRange, countsInVeryLow }));
+  clipboardText += textUtil.buildTextLine(t('{{targetRange}}   {{percentInTarget}}%', { targetRange, percentInTarget }));
+  clipboardText += textUtil.buildTextLine(t('{{lowRange}}   {{percentInLow}}%', { lowRange, percentInLow }));
+  clipboardText += textUtil.buildTextLine(t('{{veryLowRange}}   {{percentInVeryLow}}%', { veryLowRange, percentInVeryLow }));
   clipboardText += textUtil.buildTextLine('');
   clipboardText += textUtil.buildTextLine(t('Avg. Glucose (CGM): {{avgGlucose}} {{bgUnits}}', { avgGlucose, bgUnits }));
 

From d9c51bd9a115d2c4f4cb63042b99bc97ca003b23 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 11:30:31 -0800
Subject: [PATCH 13/39] fix copy percentage format

---
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index ca1d9a1d34..b168cb7daa 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -54,9 +54,9 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   const lowRange     = `${veryLowThreshold}-${targetLowerBound}`;
   const veryLowRange = `<${veryLowThreshold}`;
   
-  const percentInTarget  = formatPercentage((counts.target / counts.total) * 100, 0, true);
-  const percentInLow     = formatPercentage((counts.low * 100 ) / counts.total, 0, true);
-  const percentInVeryLow = formatPercentage((counts.veryLow * 100 ) / counts.total, 0, true);
+  const percentInTarget  = formatPercentage(counts.target / counts.total, 0, true);
+  const percentInLow     = formatPercentage(counts.low / counts.total, 0, true);
+  const percentInVeryLow = formatPercentage(counts.veryLow / counts.total, 0, true);
 
   const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
 

From b0f7b2e4b82314fa248980f97ec3b11cf6758830 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 11:31:48 -0800
Subject: [PATCH 14/39] fix avgGlucose value

---
 app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index b168cb7daa..5931294617 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -58,7 +58,7 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   const percentInLow     = formatPercentage(counts.low / counts.total, 0, true);
   const percentInVeryLow = formatPercentage(counts.veryLow / counts.total, 0, true);
 
-  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true });
+  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true })?.value;
 
   const textUtil = new TextUtil();
   let clipboardText = '';

From 2862026c3bc6c0d9697500f704abb4b2d985418f Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 12:15:23 -0800
Subject: [PATCH 15/39] tests for CGMClipboardButton

---
 .../PatientDrawer/CGMStatistics/index.js      |   8 +-
 .../MenuBar/CGMClipboardButton.js             |   8 +-
 .../MenuBar/CGMClipboardButton.test.js        | 191 ++++++++++++++++++
 3 files changed, 200 insertions(+), 7 deletions(-)
 create mode 100644 test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
index b99e8b8d59..cec9456b39 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
@@ -33,8 +33,8 @@ const TableRow = ({ label, sublabel, value, units, id }) => {
         {units && <Text sx={{ fontWeight: 'medium', fontSize: 0 }}>{units}</Text>}
       </Box>
     </Flex>
-  )
-}
+  );
+};
 
 const CGMStatistics = ({ agpCGM }) => {
   const { t } = useTranslation();
@@ -106,7 +106,7 @@ const CGMStatistics = ({ agpCGM }) => {
           />
       </Box>
     </Flex>
-  )
-}
+  );
+};
 
 export default CGMStatistics;
\ No newline at end of file
diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 5931294617..1648c64dcd 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -70,9 +70,9 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   clipboardText += textUtil.buildTextLine(t('Reporting Period: {{dateRange}}', { dateRange }));
   clipboardText += textUtil.buildTextLine('');
   clipboardText += textUtil.buildTextLine(t('Avg. Daily Time In Range ({{bgUnits}})', { bgUnits }));
-  clipboardText += textUtil.buildTextLine(t('{{targetRange}}   {{percentInTarget}}%', { targetRange, percentInTarget }));
-  clipboardText += textUtil.buildTextLine(t('{{lowRange}}   {{percentInLow}}%', { lowRange, percentInLow }));
-  clipboardText += textUtil.buildTextLine(t('{{veryLowRange}}   {{percentInVeryLow}}%', { veryLowRange, percentInVeryLow }));
+  clipboardText += textUtil.buildTextLine(t('{{targetRange}}   {{percentInTarget}}', { targetRange, percentInTarget }));
+  clipboardText += textUtil.buildTextLine(t('{{lowRange}}   {{percentInLow}}', { lowRange, percentInLow }));
+  clipboardText += textUtil.buildTextLine(t('{{veryLowRange}}   {{percentInVeryLow}}', { veryLowRange, percentInVeryLow }));
   clipboardText += textUtil.buildTextLine('');
   clipboardText += textUtil.buildTextLine(t('Avg. Glucose (CGM): {{avgGlucose}} {{bgUnits}}', { avgGlucose, bgUnits }));
 
@@ -103,6 +103,8 @@ const CGMClipboardButton = ({ patient, agpCGM }) => {
 
   const hoursOfCGMData = count * sampleFrequency;
 
+  console.log('(hoursOfCGMData / MS_IN_HOUR)', (hoursOfCGMData / MS_IN_HOUR));
+
   const isDataInsufficient = !hoursOfCGMData || ((hoursOfCGMData / MS_IN_HOUR) < 24); // minimum 24 hours
 
   const handleCopy = () => {
diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
new file mode 100644
index 0000000000..19888c7dfd
--- /dev/null
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -0,0 +1,191 @@
+/* global chai */
+/* global describe */
+/* global sinon */
+/* global afterEach */
+/* global context */
+/* global it */
+/* global beforeEach */
+
+import React from 'react';
+import { mount } from 'enzyme';
+import _ from 'lodash';
+
+import CGMClipboardButton from '../../../../../../app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton';
+
+const expect = chai.expect;
+
+const patient = {
+  'birthDate': '2001-01-01',
+  'email': 'tcrawford@test.test',
+  'fullName': 'Terence Crawford',
+  'id': '1234-abcd',
+};
+
+const agpCGM = {
+  'data': {
+    'current': {
+      'aggregationsByDate': {},
+      'stats': {
+        'averageGlucose': { 
+          'averageGlucose': 121.4013071783735, 
+          'total': 8442,
+        },
+        'bgExtents': {
+          'bgMax': 401.00001001500004,
+          'bgMin': 38.9999690761,
+          'bgDaysWorn': 30,
+          'newestDatum': { 'time': 1736783190269 },
+          'oldestDatum': { 'time': 1734249705225 },
+        },
+        'coefficientOfVariation': { 
+          'coefficientOfVariation': 49.82047988955789, 
+          'total': 8442,
+        },
+        'glucoseManagementIndicator': {
+          'glucoseManagementIndicator': 6.236871267706695,
+          'glucoseManagementIndicatorAGP': 6.236871267706695,
+          'total': 8442,
+        },
+        'sensorUsage': {
+          'sensorUsage': 2532600000,
+          'sensorUsageAGP': 99.95264030310206,
+          'total': 2592000000,
+          'sampleFrequency': 300000,
+          'count': 8442,
+        },
+        'timeInRange': {
+          'durations': {
+            'veryLow': 337739.8720682303,
+            'low': 2507462.686567164,
+            'target': 66023027.7185501,
+            'high': 14031556.503198294,
+            'veryHigh': 3500213.219616205,
+            'total': 2532600000,
+          },
+          'counts': {
+            'veryLow': 33,
+            'low': 245,
+            'target': 6451,
+            'high': 1371,
+            'veryHigh': 342,
+            'total': 8442,
+          },
+        },
+      },
+      'endpoints': {
+        'range': [1734249600000, 1736841600000 ],
+        'days': 30,
+        'activeDays': 30,
+      },
+      'data': {},
+    },
+  },
+  'timePrefs': { 'timezoneAware': true, 'timezoneName': 'Etc/GMT+8' },
+  'bgPrefs': {
+    'bgBounds': {
+      'veryHighThreshold': 250,
+      'targetUpperBound': 180,
+      'targetLowerBound': 70,
+      'veryLowThreshold': 54,
+      'extremeHighThreshold': 350,
+      'clampThreshold': 600,
+    },
+    'bgClasses': {
+      'low': { 'boundary': 70 },
+      'target': { 'boundary': 180 },
+      'very-low': { 'boundary': 54 },
+      'high': { 'boundary': 250 },
+    },
+    'bgUnits': 'mg/dL',
+  },
+  'query': {
+    'endpoints': [
+      1734249600000,
+      1736841600000,
+    ],
+    'aggregationsByDate': 'dataByDate, statsByDate',
+    'bgSource': 'cbg',
+    'stats': [
+      'averageGlucose',
+      'bgExtents',
+      'coefficientOfVariation',
+      'glucoseManagementIndicator',
+      'sensorUsage',
+      'timeInRange',
+    ],
+    'types': { 'cbg': {} },
+    'bgPrefs': {
+      'bgUnits': 'mg/dL',
+      'bgClasses': { 
+        'low': { 'boundary': 70 }, 
+        'target': { 'boundary': 180 }, 
+        'very-low': { 'boundary': 54 }, 
+        'high': { 'boundary': 250 },
+      },
+      'bgBounds': {
+        'veryHighThreshold': 250,
+        'targetUpperBound': 180,
+        'targetLowerBound': 70,
+        'veryLowThreshold': 54,
+        'extremeHighThreshold': 350,
+        'clampThreshold': 600,
+      },
+    },
+    'metaData': 'latestPumpUpload, bgSources',
+    'timePrefs': {
+      'timezoneAware': true,
+      'timezoneName': 'Etc/GMT+8',
+    },
+    'excludedDevices': [],
+  },
+  'metaData': {},
+};
+
+const expectedOutput = (
+`Terence Crawford
+Date of birth: 2001-01-01
+Exported from Tidepool TIDE: January 13th, 2025
+
+Reporting Period: December 15, 2024 - January 13, 2025
+
+Avg. Daily Time In Range (mg/dL)
+70-180   76%
+54-70   3%
+<54   0%
+
+Avg. Glucose (CGM): 121 mg/dL
+`);
+
+describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+
+  const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');
+
+  describe('When data is not present', () => {
+    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={undefined} />);
+
+    it('is disabled', () => {
+      expect(wrapper.find('button').props().disabled).to.be.true;
+    });
+  });
+
+  describe('When data is insufficient', () => {
+    const insufficientAgpCGM = _.cloneDeep(agpCGM);
+    insufficientAgpCGM.data.current.stats.sensorUsage.count = 100;
+
+    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={insufficientAgpCGM} />);
+
+    it('is disabled', () => {
+      expect(wrapper.find('button').props().disabled).to.be.true;
+    });
+  });
+
+  describe('When data is present', () => {
+    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={agpCGM} />);
+    wrapper.find('button').simulate('click');
+
+    it('calls writeText on navigator API with correct data', () => {
+      expect(wrapper.find('button').props().disabled).to.be.false;
+      expect(writeTextSpy.getCall(0).args[0]).to.eql(expectedOutput);
+    });
+  });
+});

From 4ff5b08455f1e51a7a5f32dbc1c9febe87c83a47 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 12:29:23 -0800
Subject: [PATCH 16/39] fix CGMClipboardButton test bug

---
 .../MenuBar/CGMClipboardButton.js             |  2 +-
 .../MenuBar/CGMClipboardButton.test.js        | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 1648c64dcd..55244ca0a4 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -58,7 +58,7 @@ const getCGMClipboardText = (patient, agpCGM, t) => {
   const percentInLow     = formatPercentage(counts.low / counts.total, 0, true);
   const percentInVeryLow = formatPercentage(counts.veryLow / counts.total, 0, true);
 
-  const avgGlucose = formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true })?.value;
+  const avgGlucose = averageGlucose ? formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true })?.value : null;
 
   const textUtil = new TextUtil();
   let clipboardText = '';
diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index 19888c7dfd..507a4acf63 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -168,7 +168,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
     });
   });
 
-  describe('When data is insufficient', () => {
+  describe('When data is insufficient due to too few enough readings', () => {
     const insufficientAgpCGM = _.cloneDeep(agpCGM);
     insufficientAgpCGM.data.current.stats.sensorUsage.count = 100;
 
@@ -179,6 +179,27 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
     });
   });
 
+  describe('When data is insufficient due to being BGM patient', () => {
+    const insufficientAgpCGM = _.cloneDeep(agpCGM);
+    insufficientAgpCGM.data.current.stats = {
+      averageGlucose: { averageGlucose: null, total: 0 },
+      bgExtents: { bgMax: null, bgMin: null, bgDaysWorn: 0 },
+      coefficientOfVariation: { coefficientOfVariation: null, total: 0, insufficientData: true },
+      glucoseManagementIndicator: { glucoseManagementIndicator: null, glucoseManagementIndicatorAGP: null, insufficientData: true },
+      sensorUsage: { sensorUsage: 0, sensorUsageAGP: 0, total: 2592000000, sampleFrequency: 300000, count: 0 },
+      timeInRange: { 
+        durations: { veryLow: null, low: null, target: null, high: null, veryHigh: null, total: 0 },
+        counts: { veryLow: 0, low: 0, target: 0, high: 0, veryHigh: 0, total: 0 },
+      },
+    };
+
+    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={insufficientAgpCGM} />);
+
+    it('is disabled', () => {
+      expect(wrapper.find('button').props().disabled).to.be.true;
+    });
+  });
+
   describe('When data is present', () => {
     const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={agpCGM} />);
     wrapper.find('button').simulate('click');

From 6b504d26c92eaa0248740aff7093533b3954e7aa Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 13:25:14 -0800
Subject: [PATCH 17/39] move clipboard text to own text function in viz

---
 .../MenuBar/CGMClipboardButton.js             | 85 ++-----------------
 .../PatientDrawer/MenuBar/MenuBar.js          |  8 +-
 2 files changed, 10 insertions(+), 83 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 55244ca0a4..903329807d 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -1,93 +1,20 @@
 import React, { useEffect, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import Button from '../../../../components/elements/Button';
-import utils from '../../../../core/utils';
-import { MGDL_UNITS, MS_IN_HOUR } from '../../../../core/constants';
-import { utils as vizUtils } from '@tidepool/viz';
-const { TextUtil } = vizUtils.text;
-const { formatPercentage, formatDatum } = vizUtils.stat;
+import { MS_IN_HOUR } from '../../../../core/constants';
 import { Box } from 'theme-ui';
-import moment from 'moment';
-
-const formatDateRange = (startEndpoint, endEndpoint, timezoneName) => {
-  const startDate = moment.utc(startEndpoint).tz(timezoneName);
-  const endDate   = moment.utc(endEndpoint).tz(timezoneName);
-  const startYear = startDate.year();
-  const endYear   = endDate.year();
-
-  if (startYear !== endYear) {
-    return `${startDate.format('MMMM D, YYYY')} - ${endDate.format('MMMM D, YYYY')}`;
-  }
-
-  return `${startDate.format('MMMM D')} - ${endDate.format('MMMM D')}, ${endDate.format('YYYY')}`;
-};
-
-const getCGMClipboardText = (patient, agpCGM, t) => {
-  if (!agpCGM || !patient) return '';
-
-  const { fullName, birthDate } = patient;
-
-  const {
-    timePrefs,
-    bgPrefs,
-    data: {
-      current: {
-        stats: {
-          bgExtents: { newestDatum, oldestDatum },
-          averageGlucose: { averageGlucose },
-          timeInRange: { counts },
-        },
-      },
-    },
-  } = agpCGM;
-
-  const { bgUnits, bgBounds } = bgPrefs || {};
-  const { targetUpperBound, targetLowerBound, veryLowThreshold } = bgBounds || {};
-
-  const timezoneName = vizUtils.datetime.getTimezoneFromTimePrefs(timePrefs);
-
-  const currentDate = moment().format('MMMM Do, YYYY');
-
-  const dateRange = formatDateRange(oldestDatum?.time, newestDatum?.time, timezoneName);
-
-  const targetRange  = `${targetLowerBound}-${targetUpperBound}`;
-  const lowRange     = `${veryLowThreshold}-${targetLowerBound}`;
-  const veryLowRange = `<${veryLowThreshold}`;
-  
-  const percentInTarget  = formatPercentage(counts.target / counts.total, 0, true);
-  const percentInLow     = formatPercentage(counts.low / counts.total, 0, true);
-  const percentInVeryLow = formatPercentage(counts.veryLow / counts.total, 0, true);
-
-  const avgGlucose = averageGlucose ? formatDatum({ value: averageGlucose }, 'bgValue', { bgPrefs, useAGPFormat: true })?.value : null;
-
-  const textUtil = new TextUtil();
-  let clipboardText = '';
-
-  clipboardText += textUtil.buildTextLine(fullName);
-  clipboardText += textUtil.buildTextLine(t('Date of birth: {{birthDate}}', { birthDate }));
-  clipboardText += textUtil.buildTextLine(t('Exported from Tidepool TIDE: {{currentDate}}', { currentDate }));
-  clipboardText += textUtil.buildTextLine('');
-  clipboardText += textUtil.buildTextLine(t('Reporting Period: {{dateRange}}', { dateRange }));
-  clipboardText += textUtil.buildTextLine('');
-  clipboardText += textUtil.buildTextLine(t('Avg. Daily Time In Range ({{bgUnits}})', { bgUnits }));
-  clipboardText += textUtil.buildTextLine(t('{{targetRange}}   {{percentInTarget}}', { targetRange, percentInTarget }));
-  clipboardText += textUtil.buildTextLine(t('{{lowRange}}   {{percentInLow}}', { lowRange, percentInLow }));
-  clipboardText += textUtil.buildTextLine(t('{{veryLowRange}}   {{percentInVeryLow}}', { veryLowRange, percentInVeryLow }));
-  clipboardText += textUtil.buildTextLine('');
-  clipboardText += textUtil.buildTextLine(t('Avg. Glucose (CGM): {{avgGlucose}} {{bgUnits}}', { avgGlucose, bgUnits }));
-
-  return clipboardText;
-};
+import { utils as vizUtils } from '@tidepool/viz';
+const { agpCGMText } = vizUtils.text;
 
 const STATE = {
   DEFAULT: 'DEFAULT',
   CLICKED: 'CLICKED',
 };
 
-const CGMClipboardButton = ({ patient, agpCGM }) => {
+const CGMClipboardButton = ({ patient, pdf }) => {
   const { t } = useTranslation();
   const [buttonState, setButtonState] = useState(STATE.DEFAULT);
-  const clipboardText = useMemo(() => getCGMClipboardText(patient, agpCGM, t), [patient, agpCGM, t]);
+  const clipboardText = useMemo(() => agpCGMText(patient, pdf), [patient, pdf]);
 
   useEffect(() => {
     let buttonTextEffect = setTimeout(() => {
@@ -99,7 +26,7 @@ const CGMClipboardButton = ({ patient, agpCGM }) => {
     };
   }, [buttonState]);
 
-  const { count, sampleFrequency } = agpCGM?.data?.current?.stats?.sensorUsage || {};
+  const { count, sampleFrequency } = pdf?.data?.agpCGM?.data?.current?.stats?.sensorUsage || {};
 
   const hoursOfCGMData = count * sampleFrequency;
 
diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
index e001a1b62b..461c2f0a2b 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
@@ -19,7 +19,7 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
 
   const selectedClinicId = useSelector(state => state.blip.selectedClinicId);
   const patient = useSelector(state => state.blip.clinics[state.blip.selectedClinicId]?.patients?.[patientId]);
-  const agpCGM = useSelector(state => state.blip.pdf?.data?.agpCGM); // IMPORTANT: Data taken from Redux PDF slice
+  const pdf = useSelector(state => state.blip.pdf); // IMPORTANT: Data taken from Redux PDF slice
 
   useEffect(() => {
     // DOB field in Patient object may not be populated in TIDE Dashboard, so we need to refetch
@@ -35,8 +35,8 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
   const handleReviewSuccess = () => {
     setTimeout(() => {
       onClose();
-    }, 500)
-  }
+    }, 500);
+  };
 
   const { fullName, birthDate } = patient || {}; 
   
@@ -60,7 +60,7 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
       </Flex>
       
       <Flex sx={{ justifyContent: 'flex-start', alignItems: 'center' }}>
-        <CGMClipboardButton patient={patient} agpCGM={agpCGM} />
+        <CGMClipboardButton patient={patient} pdf={pdf} />
       </Flex>
 
       <Flex sx={{ fontSize: 0, alignItems: 'center', justifyContent: 'flex-end' }}>

From bd633bfac2999a1b348eee82e82149bba05c7add Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 13:28:37 -0800
Subject: [PATCH 18/39] remove console.log

---
 app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 903329807d..8316081f7e 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -30,8 +30,6 @@ const CGMClipboardButton = ({ patient, pdf }) => {
 
   const hoursOfCGMData = count * sampleFrequency;
 
-  console.log('(hoursOfCGMData / MS_IN_HOUR)', (hoursOfCGMData / MS_IN_HOUR));
-
   const isDataInsufficient = !hoursOfCGMData || ((hoursOfCGMData / MS_IN_HOUR) < 24); // minimum 24 hours
 
   const handleCopy = () => {

From cedc6a6060b57f78d0359c16e8e376f0262cc4a3 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 13:43:48 -0800
Subject: [PATCH 19/39] adjust CGMClipboardButton tests

---
 .../MenuBar/CGMClipboardButton.test.js        | 254 +++++++++---------
 1 file changed, 130 insertions(+), 124 deletions(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index 507a4acf63..bcda384cfa 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -15,131 +15,135 @@ import CGMClipboardButton from '../../../../../../app/pages/dashboard/PatientDra
 const expect = chai.expect;
 
 const patient = {
-  'birthDate': '2001-01-01',
-  'email': 'tcrawford@test.test',
-  'fullName': 'Terence Crawford',
-  'id': '1234-abcd',
+  birthDate: '2001-01-01',
+  email: 'tcrawford@test.test',
+  fullName: 'Terence Crawford',
+  id: '1234-abcd',
 };
 
-const agpCGM = {
+const pdf = {
   'data': {
-    'current': {
-      'aggregationsByDate': {},
-      'stats': {
-        'averageGlucose': { 
-          'averageGlucose': 121.4013071783735, 
-          'total': 8442,
-        },
-        'bgExtents': {
-          'bgMax': 401.00001001500004,
-          'bgMin': 38.9999690761,
-          'bgDaysWorn': 30,
-          'newestDatum': { 'time': 1736783190269 },
-          'oldestDatum': { 'time': 1734249705225 },
-        },
-        'coefficientOfVariation': { 
-          'coefficientOfVariation': 49.82047988955789, 
-          'total': 8442,
-        },
-        'glucoseManagementIndicator': {
-          'glucoseManagementIndicator': 6.236871267706695,
-          'glucoseManagementIndicatorAGP': 6.236871267706695,
-          'total': 8442,
+    'agpCGM': {
+        'data': {
+          'current': {
+            'aggregationsByDate': {},
+            'stats': {
+              'averageGlucose': { 
+                'averageGlucose': 121.4013071783735, 
+                'total': 8442,
+              },
+              'bgExtents': {
+                'bgMax': 401.00001001500004,
+                'bgMin': 38.9999690761,
+                'bgDaysWorn': 30,
+                'newestDatum': { 'time': 1736783190269 },
+                'oldestDatum': { 'time': 1734249705225 },
+              },
+              'coefficientOfVariation': { 
+                'coefficientOfVariation': 49.82047988955789, 
+                'total': 8442,
+              },
+              'glucoseManagementIndicator': {
+                'glucoseManagementIndicator': 6.236871267706695,
+                'glucoseManagementIndicatorAGP': 6.236871267706695,
+                'total': 8442,
+              },
+              'sensorUsage': {
+                'sensorUsage': 2532600000,
+                'sensorUsageAGP': 99.95264030310206,
+                'total': 2592000000,
+                'sampleFrequency': 300000,
+                'count': 8442,
+              },
+              'timeInRange': {
+                'durations': {
+                  'veryLow': 337739.8720682303,
+                  'low': 2507462.686567164,
+                  'target': 66023027.7185501,
+                  'high': 14031556.503198294,
+                  'veryHigh': 3500213.219616205,
+                  'total': 2532600000,
+                },
+                'counts': {
+                  'veryLow': 33,
+                  'low': 245,
+                  'target': 6451,
+                  'high': 1371,
+                  'veryHigh': 342,
+                  'total': 8442,
+                },
+              },
+            },
+            'endpoints': {
+              'range': [1734249600000, 1736841600000 ],
+              'days': 30,
+              'activeDays': 30,
+            },
+            'data': {},
+          },
         },
-        'sensorUsage': {
-          'sensorUsage': 2532600000,
-          'sensorUsageAGP': 99.95264030310206,
-          'total': 2592000000,
-          'sampleFrequency': 300000,
-          'count': 8442,
+        'timePrefs': { 'timezoneAware': true, 'timezoneName': 'Etc/GMT+8' },
+        'bgPrefs': {
+          'bgBounds': {
+            'veryHighThreshold': 250,
+            'targetUpperBound': 180,
+            'targetLowerBound': 70,
+            'veryLowThreshold': 54,
+            'extremeHighThreshold': 350,
+            'clampThreshold': 600,
+          },
+          'bgClasses': {
+            'low': { 'boundary': 70 },
+            'target': { 'boundary': 180 },
+            'very-low': { 'boundary': 54 },
+            'high': { 'boundary': 250 },
+          },
+          'bgUnits': 'mg/dL',
         },
-        'timeInRange': {
-          'durations': {
-            'veryLow': 337739.8720682303,
-            'low': 2507462.686567164,
-            'target': 66023027.7185501,
-            'high': 14031556.503198294,
-            'veryHigh': 3500213.219616205,
-            'total': 2532600000,
+        'query': {
+          'endpoints': [
+            1734249600000,
+            1736841600000,
+          ],
+          'aggregationsByDate': 'dataByDate, statsByDate',
+          'bgSource': 'cbg',
+          'stats': [
+            'averageGlucose',
+            'bgExtents',
+            'coefficientOfVariation',
+            'glucoseManagementIndicator',
+            'sensorUsage',
+            'timeInRange',
+          ],
+          'types': { 'cbg': {} },
+          'bgPrefs': {
+            'bgUnits': 'mg/dL',
+            'bgClasses': { 
+              'low': { 'boundary': 70 }, 
+              'target': { 'boundary': 180 }, 
+              'very-low': { 'boundary': 54 }, 
+              'high': { 'boundary': 250 },
+            },
+            'bgBounds': {
+              'veryHighThreshold': 250,
+              'targetUpperBound': 180,
+              'targetLowerBound': 70,
+              'veryLowThreshold': 54,
+              'extremeHighThreshold': 350,
+              'clampThreshold': 600,
+            },
           },
-          'counts': {
-            'veryLow': 33,
-            'low': 245,
-            'target': 6451,
-            'high': 1371,
-            'veryHigh': 342,
-            'total': 8442,
+          'metaData': 'latestPumpUpload, bgSources',
+          'timePrefs': {
+            'timezoneAware': true,
+            'timezoneName': 'Etc/GMT+8',
           },
+          'excludedDevices': [],
         },
+        'metaData': {},
       },
-      'endpoints': {
-        'range': [1734249600000, 1736841600000 ],
-        'days': 30,
-        'activeDays': 30,
-      },
-      'data': {},
-    },
-  },
-  'timePrefs': { 'timezoneAware': true, 'timezoneName': 'Etc/GMT+8' },
-  'bgPrefs': {
-    'bgBounds': {
-      'veryHighThreshold': 250,
-      'targetUpperBound': 180,
-      'targetLowerBound': 70,
-      'veryLowThreshold': 54,
-      'extremeHighThreshold': 350,
-      'clampThreshold': 600,
     },
-    'bgClasses': {
-      'low': { 'boundary': 70 },
-      'target': { 'boundary': 180 },
-      'very-low': { 'boundary': 54 },
-      'high': { 'boundary': 250 },
-    },
-    'bgUnits': 'mg/dL',
-  },
-  'query': {
-    'endpoints': [
-      1734249600000,
-      1736841600000,
-    ],
-    'aggregationsByDate': 'dataByDate, statsByDate',
-    'bgSource': 'cbg',
-    'stats': [
-      'averageGlucose',
-      'bgExtents',
-      'coefficientOfVariation',
-      'glucoseManagementIndicator',
-      'sensorUsage',
-      'timeInRange',
-    ],
-    'types': { 'cbg': {} },
-    'bgPrefs': {
-      'bgUnits': 'mg/dL',
-      'bgClasses': { 
-        'low': { 'boundary': 70 }, 
-        'target': { 'boundary': 180 }, 
-        'very-low': { 'boundary': 54 }, 
-        'high': { 'boundary': 250 },
-      },
-      'bgBounds': {
-        'veryHighThreshold': 250,
-        'targetUpperBound': 180,
-        'targetLowerBound': 70,
-        'veryLowThreshold': 54,
-        'extremeHighThreshold': 350,
-        'clampThreshold': 600,
-      },
-    },
-    'metaData': 'latestPumpUpload, bgSources',
-    'timePrefs': {
-      'timezoneAware': true,
-      'timezoneName': 'Etc/GMT+8',
-    },
-    'excludedDevices': [],
-  },
-  'metaData': {},
-};
+  };
 
 const expectedOutput = (
 `Terence Crawford
@@ -156,12 +160,14 @@ Avg. Daily Time In Range (mg/dL)
 Avg. Glucose (CGM): 121 mg/dL
 `);
 
-describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+describe.only('PatientDrawer/MenuBar/CGMClipboardButton', () => {
 
   const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');
 
+  const insufficientPDF = { data: {} };
+
   describe('When data is not present', () => {
-    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={undefined} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -169,10 +175,10 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is insufficient due to too few enough readings', () => {
-    const insufficientAgpCGM = _.cloneDeep(agpCGM);
-    insufficientAgpCGM.data.current.stats.sensorUsage.count = 100;
+    const insufficientPDF = _.cloneDeep(pdf);
+    insufficientPDF.data.agpCGM.data.current.stats.sensorUsage.count = 100;
 
-    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={insufficientAgpCGM} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -180,8 +186,8 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is insufficient due to being BGM patient', () => {
-    const insufficientAgpCGM = _.cloneDeep(agpCGM);
-    insufficientAgpCGM.data.current.stats = {
+    const insufficientPDF = _.cloneDeep(pdf);
+    insufficientPDF.data.agpCGM.data.current.stats = {
       averageGlucose: { averageGlucose: null, total: 0 },
       bgExtents: { bgMax: null, bgMin: null, bgDaysWorn: 0 },
       coefficientOfVariation: { coefficientOfVariation: null, total: 0, insufficientData: true },
@@ -193,7 +199,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
       },
     };
 
-    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={insufficientAgpCGM} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -201,7 +207,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is present', () => {
-    const wrapper = mount(<CGMClipboardButton patient={patient} agpCGM={agpCGM} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={pdf} />);
     wrapper.find('button').simulate('click');
 
     it('calls writeText on navigator API with correct data', () => {

From f75b242f7ef156a293671787e8af9585fcdefc40 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 13:46:04 -0800
Subject: [PATCH 20/39] remove accidental .only

---
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index bcda384cfa..32b745216a 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -160,7 +160,7 @@ Avg. Daily Time In Range (mg/dL)
 Avg. Glucose (CGM): 121 mg/dL
 `);
 
-describe.only('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
 
   const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');
 

From 5617132b3b8772c9b8825603569e44b15e33de08 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Mon, 13 Jan 2025 15:21:24 -0800
Subject: [PATCH 21/39] move text specifics to viz

---
 .../MenuBar/CGMClipboardButton.test.js        | 168 +++---------------
 1 file changed, 24 insertions(+), 144 deletions(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index 32b745216a..70a6e61296 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -4,7 +4,8 @@
 /* global afterEach */
 /* global context */
 /* global it */
-/* global beforeEach */
+/* global before */
+/* global after */
 
 import React from 'react';
 import { mount } from 'enzyme';
@@ -22,151 +23,32 @@ const patient = {
 };
 
 const pdf = {
-  'data': {
+  'data': { // truncated for brevity
     'agpCGM': {
-        'data': {
-          'current': {
-            'aggregationsByDate': {},
-            'stats': {
-              'averageGlucose': { 
-                'averageGlucose': 121.4013071783735, 
-                'total': 8442,
-              },
-              'bgExtents': {
-                'bgMax': 401.00001001500004,
-                'bgMin': 38.9999690761,
-                'bgDaysWorn': 30,
-                'newestDatum': { 'time': 1736783190269 },
-                'oldestDatum': { 'time': 1734249705225 },
-              },
-              'coefficientOfVariation': { 
-                'coefficientOfVariation': 49.82047988955789, 
-                'total': 8442,
-              },
-              'glucoseManagementIndicator': {
-                'glucoseManagementIndicator': 6.236871267706695,
-                'glucoseManagementIndicatorAGP': 6.236871267706695,
-                'total': 8442,
-              },
-              'sensorUsage': {
-                'sensorUsage': 2532600000,
-                'sensorUsageAGP': 99.95264030310206,
-                'total': 2592000000,
-                'sampleFrequency': 300000,
-                'count': 8442,
-              },
-              'timeInRange': {
-                'durations': {
-                  'veryLow': 337739.8720682303,
-                  'low': 2507462.686567164,
-                  'target': 66023027.7185501,
-                  'high': 14031556.503198294,
-                  'veryHigh': 3500213.219616205,
-                  'total': 2532600000,
-                },
-                'counts': {
-                  'veryLow': 33,
-                  'low': 245,
-                  'target': 6451,
-                  'high': 1371,
-                  'veryHigh': 342,
-                  'total': 8442,
-                },
-              },
+      'data': {
+        'current': {
+          'stats': {
+            'sensorUsage': {
+              'sensorUsage': 2532600000,
+              'sensorUsageAGP': 99.95264030310206,
+              'total': 2592000000,
+              'sampleFrequency': 300000,
+              'count': 8442,
             },
-            'endpoints': {
-              'range': [1734249600000, 1736841600000 ],
-              'days': 30,
-              'activeDays': 30,
-            },
-            'data': {},
-          },
-        },
-        'timePrefs': { 'timezoneAware': true, 'timezoneName': 'Etc/GMT+8' },
-        'bgPrefs': {
-          'bgBounds': {
-            'veryHighThreshold': 250,
-            'targetUpperBound': 180,
-            'targetLowerBound': 70,
-            'veryLowThreshold': 54,
-            'extremeHighThreshold': 350,
-            'clampThreshold': 600,
-          },
-          'bgClasses': {
-            'low': { 'boundary': 70 },
-            'target': { 'boundary': 180 },
-            'very-low': { 'boundary': 54 },
-            'high': { 'boundary': 250 },
           },
-          'bgUnits': 'mg/dL',
         },
-        'query': {
-          'endpoints': [
-            1734249600000,
-            1736841600000,
-          ],
-          'aggregationsByDate': 'dataByDate, statsByDate',
-          'bgSource': 'cbg',
-          'stats': [
-            'averageGlucose',
-            'bgExtents',
-            'coefficientOfVariation',
-            'glucoseManagementIndicator',
-            'sensorUsage',
-            'timeInRange',
-          ],
-          'types': { 'cbg': {} },
-          'bgPrefs': {
-            'bgUnits': 'mg/dL',
-            'bgClasses': { 
-              'low': { 'boundary': 70 }, 
-              'target': { 'boundary': 180 }, 
-              'very-low': { 'boundary': 54 }, 
-              'high': { 'boundary': 250 },
-            },
-            'bgBounds': {
-              'veryHighThreshold': 250,
-              'targetUpperBound': 180,
-              'targetLowerBound': 70,
-              'veryLowThreshold': 54,
-              'extremeHighThreshold': 350,
-              'clampThreshold': 600,
-            },
-          },
-          'metaData': 'latestPumpUpload, bgSources',
-          'timePrefs': {
-            'timezoneAware': true,
-            'timezoneName': 'Etc/GMT+8',
-          },
-          'excludedDevices': [],
-        },
-        'metaData': {},
       },
     },
-  };
-
-const expectedOutput = (
-`Terence Crawford
-Date of birth: 2001-01-01
-Exported from Tidepool TIDE: January 13th, 2025
-
-Reporting Period: December 15, 2024 - January 13, 2025
-
-Avg. Daily Time In Range (mg/dL)
-70-180   76%
-54-70   3%
-<54   0%
-
-Avg. Glucose (CGM): 121 mg/dL
-`);
+  },
+};
 
-describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+describe.only('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+  CGMClipboardButton.__Rewire__('agpCGMText', sinon.stub().returns('AGP_DATA_STRING_TO_COPY'));
 
   const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');
 
-  const insufficientPDF = { data: {} };
-
   describe('When data is not present', () => {
+    const insufficientPDF = { data: {} };
     const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
 
     it('is disabled', () => {
@@ -188,14 +70,12 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   describe('When data is insufficient due to being BGM patient', () => {
     const insufficientPDF = _.cloneDeep(pdf);
     insufficientPDF.data.agpCGM.data.current.stats = {
-      averageGlucose: { averageGlucose: null, total: 0 },
-      bgExtents: { bgMax: null, bgMin: null, bgDaysWorn: 0 },
-      coefficientOfVariation: { coefficientOfVariation: null, total: 0, insufficientData: true },
-      glucoseManagementIndicator: { glucoseManagementIndicator: null, glucoseManagementIndicatorAGP: null, insufficientData: true },
-      sensorUsage: { sensorUsage: 0, sensorUsageAGP: 0, total: 2592000000, sampleFrequency: 300000, count: 0 },
-      timeInRange: { 
-        durations: { veryLow: null, low: null, target: null, high: null, veryHigh: null, total: 0 },
-        counts: { veryLow: 0, low: 0, target: 0, high: 0, veryHigh: 0, total: 0 },
+      sensorUsage: { 
+        sensorUsage: 0, 
+        sensorUsageAGP: 0, 
+        total: 2592000000, 
+        sampleFrequency: 300000, 
+        count: 0,
       },
     };
 
@@ -212,7 +92,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
 
     it('calls writeText on navigator API with correct data', () => {
       expect(wrapper.find('button').props().disabled).to.be.false;
-      expect(writeTextSpy.getCall(0).args[0]).to.eql(expectedOutput);
+      expect(writeTextSpy.getCall(0).args[0]).to.eql('AGP_DATA_STRING_TO_COPY');
     });
   });
 });

From 14adf884fcbff50f80771f33a0d0380364b70e89 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 08:27:20 -0800
Subject: [PATCH 22/39] use existing gray

---
 app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js | 2 +-
 app/themes/colorPalette.js                           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
index 461c2f0a2b..bad8d7adbf 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
@@ -47,7 +47,7 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
           {fullName}
         </Text>
         { birthDate &&
-          <Text sx={{ color: colorPalette.extended.grays[10], fontWeight: 'medium', fontSize: 0 }}>
+          <Text sx={{ color: colorPalette.extended.grays[5], fontWeight: 'medium', fontSize: 0 }}>
             {t('DOB: {{birthDate}}', { birthDate })}
           </Text>
         }
diff --git a/app/themes/colorPalette.js b/app/themes/colorPalette.js
index 156421b957..9d11e76617 100644
--- a/app/themes/colorPalette.js
+++ b/app/themes/colorPalette.js
@@ -72,7 +72,6 @@ export default {
       '#5A5A5A',
       '#505050',
       '#3E3E3E',
-      '#707070'
     ],
     greens: [
       '#E6F8ED',

From 8a5f476d5406046de9c306d6213da41722e6f3ae Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 18:28:38 +0100
Subject: [PATCH 23/39] remove agpBGM from queries/opts

---
 app/pages/dashboard/PatientDrawer/Content.js  |  3 +-
 .../PatientDrawer/useAgpCGM/getOpts.js        | 42 ++-------
 .../PatientDrawer/useAgpCGM/getQueries.js     | 90 +++++--------------
 .../PatientDrawer/useAgpCGM/useAgpCGM.js      | 10 ++-
 4 files changed, 38 insertions(+), 107 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/Content.js b/app/pages/dashboard/PatientDrawer/Content.js
index b117e44067..2365b46bce 100644
--- a/app/pages/dashboard/PatientDrawer/Content.js
+++ b/app/pages/dashboard/PatientDrawer/Content.js
@@ -60,8 +60,9 @@ const Content = ({ api, patientId, agpPeriodInDays }) => {
   const patient = clinic?.patients?.[patientId];
 
   if (status === STATUS.NO_PATIENT_DATA)   return <NoPatientData patientName={patient?.fullName}/>;
+  if (status === STATUS.NO_CGM_DATA)    return <NoPatientData patientName={patient?.fullName}/>;
   if (status === STATUS.INSUFFICIENT_DATA) return <InsufficientData />;
-  if (status !== STATUS.SVGS_GENERATED)    return <Loader show={true} overlay={false} />
+  if (status !== STATUS.SVGS_GENERATED)    return <Loader show={true} overlay={false} />;
 
   const percentInRanges          = svgDataURLS?.agpCGM?.percentInRanges;
   const ambulatoryGlucoseProfile = svgDataURLS?.agpCGM?.ambulatoryGlucoseProfile;
diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
index 8449ff7ce0..34867d76d6 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/getOpts.js
@@ -10,33 +10,15 @@ const getOpts = (
   data, // data from redux (state.blip.data)
   agpPeriodInDays,
 ) => {
-  const getMostRecentDatumTimeByChartType = (data, chartType) => {
-    let latestDatums;
+  const getMostRecentDatumTimeByChartType = (data, _chartType) => {
     const getLatestDatums = types => _.pick(_.get(data, 'metaData.latestDatumByType'), types);
 
-    switch (chartType) { // cases for 'trends', 'bgLog', 'daily', and 'basics' omitted
-      case 'agpBGM':
-        latestDatums = getLatestDatums([
-          'smbg',
-        ]);
-        break;
-
-      case 'agpCGM':
-        latestDatums = getLatestDatums([
-          'cbg',
-        ]);
-        break;
-
-      default:
-        latestDatums = [];
-        break;
-    }
-
+    let latestDatums = getLatestDatums(['cbg']) || [];
+    
     return _.max(_.map(latestDatums, d => (d.normalEnd || d.normalTime)));
-  }
+  };
 
   const mostRecentDatumDates = {
-    agpBGM: getMostRecentDatumTimeByChartType(data, 'agpBGM'),
     agpCGM: getMostRecentDatumTimeByChartType(data, 'agpCGM'),
   };
 
@@ -47,7 +29,7 @@ const getOpts = (
     const localTimePrefs = utils.getTimePrefsForDataProcessing(latestTimeZone, queryParams);
     
     return localTimePrefs;
-  })()
+  })();
 
   const timezoneName = getTimezoneFromTimePrefs(timePrefs);
 
@@ -69,14 +51,7 @@ const getOpts = (
     });
   };
 
-  const defaultDates = () => ({ 
-    agpBGM: getLastNDays(agpPeriodInDays, 'agpBGM'),
-    agpCGM: getLastNDays(agpPeriodInDays, 'agpCGM'),
-
-    // 'trends', 'bgLog', 'daily', and 'basics' omitted
-  });
-
-  const dates = defaultDates();
+  const dates = getLastNDays(agpPeriodInDays, 'agpCGM');
 
   const formatDateEndpoints = ({ startDate, endDate }) => (startDate && endDate ? [
     startDate.valueOf(),
@@ -84,9 +59,8 @@ const getOpts = (
   ] : []);
 
   const opts = {
-    agpCGM:   { disabled: false, endpoints: formatDateEndpoints(dates.agpCGM) },
-    agpBGM:   { disabled: false, endpoints: formatDateEndpoints(dates.agpBGM) },
-
+    agpCGM:   { disabled: false, endpoints: formatDateEndpoints(dates) },
+    agpBGM:   { disabled: true },
     basics:   { disabled: true },
     bgLog:    { disabled: true },
     daily:    { disabled: true },
diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/getQueries.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/getQueries.js
index b3bc9222f7..ef04b9ee60 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/getQueries.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/getQueries.js
@@ -1,19 +1,8 @@
 import _ from 'lodash';
 import { utils as vizUtils } from '@tidepool/viz';
-import utils from '../../../../core/utils';
+const { commonStats } = vizUtils.stat;
 
-const chartPrefs = {
-  agpBGM: {
-    bgSource: 'smbg',
-  },
-  agpCGM: {
-    bgSource: 'cbg',
-  },
-  settings: {
-    touched: false,
-  },
-  excludedDevices: [],
-};
+import utils from '../../../../core/utils';
 
 const getQueries = (
   data,
@@ -44,65 +33,30 @@ const getQueries = (
     return localTimePrefs;
   })();
 
-  const getStatsByChartType = (chartType, _bgSource) => {
-    const { commonStats } = vizUtils.stat;
-
-    let stats = [];
-
-    switch (chartType) { // cases 'basics', 'trends', 'bgLog', and 'daily' omitted
-      case 'agpBGM':
-        stats.push(commonStats.averageGlucose,);
-        stats.push(commonStats.bgExtents,);
-        stats.push(commonStats.coefficientOfVariation,);
-        stats.push(commonStats.glucoseManagementIndicator,);
-        stats.push(commonStats.readingsInRange,);
-        break;
-
-      case 'agpCGM':
-        stats.push(commonStats.averageGlucose);
-        stats.push(commonStats.bgExtents);
-        stats.push(commonStats.coefficientOfVariation);
-        stats.push(commonStats.glucoseManagementIndicator);
-        stats.push(commonStats.sensorUsage);
-        stats.push(commonStats.timeInRange);
-        break;
-    }
-
-    return stats;
-  }
-
-  const commonQueries = {
-    bgPrefs: bgPrefs,
-    metaData: 'latestPumpUpload, bgSources',
-    timePrefs: timePrefs,
-    excludedDevices: chartPrefs?.excludedDevices,
-  };
-
-  const queries = {}
-
-  if (!opts.agpBGM?.disabled) {
-    queries.agpBGM = {
-      endpoints: opts.agpBGM?.endpoints,
-      aggregationsByDate: 'dataByDate, statsByDate',
-      bgSource: _.get(chartPrefs, 'agpBGM.bgSource'),
-      stats: getStatsByChartType('agpBGM'),
-      types: { smbg: {} },
-      ...commonQueries,
-    };
-  }
-
-  if (!opts.agpCGM?.disabled) {
-    queries.agpCGM = {
+  let stats = [
+    commonStats.averageGlucose,
+    commonStats.bgExtents,
+    commonStats.coefficientOfVariation,
+    commonStats.glucoseManagementIndicator,
+    commonStats.sensorUsage,
+    commonStats.timeInRange,
+  ];
+
+  const queries = {
+    agpCGM: {
       endpoints: opts.agpCGM?.endpoints,
       aggregationsByDate: 'dataByDate, statsByDate',
-      bgSource: _.get(chartPrefs, 'agpCGM.bgSource'),
-      stats: getStatsByChartType('agpCGM'),
+      bgSource: 'cbg',
+      stats,
       types: { cbg: {} },
-      ...commonQueries,
-    };
-  }
+      bgPrefs,
+      metaData: 'latestPumpUpload, bgSources',
+      timePrefs,
+      excludedDevices: [],
+    },
+  };
 
   return queries;
-}
+};
 
 export default getQueries;
\ No newline at end of file
diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
index 9bcdc62fa6..a2e289c45c 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
@@ -17,7 +17,7 @@ export const STATUS = {
   // Other states
   NO_PATIENT_DATA:   'NO_PATIENT_DATA',
   INSUFFICIENT_DATA: 'INSUFFICIENT_DATA',
-}
+};
 
 // TODO: Revisit best way to listen for progress when we move away from blip.working
 const inferLastCompletedStep = (patientId, data, pdf) => {
@@ -33,9 +33,11 @@ const inferLastCompletedStep = (patientId, data, pdf) => {
   // Insufficient Data States ---
   const hasNoPatientData    = data.metaData?.size === 0;
   const hasInsufficientData = !!pdf?.opts?.svgDataURLS && !pdf?.opts?.svgDataURLS.agpCGM;
+  const hasNoCGMData        = !!pdf?.combined && !pdf?.data;
 
   if (hasNoPatientData)    return STATUS.NO_PATIENT_DATA;
   if (hasInsufficientData) return STATUS.INSUFFICIENT_DATA;
+  if (hasNoCGMData)        return STATUS.NO_CGM_DATA;
 
   // Happy Path States ---
   const hasImagesInState  = !!pdf?.opts?.svgDataURLS;
@@ -47,7 +49,7 @@ const inferLastCompletedStep = (patientId, data, pdf) => {
   if (hasPatientInState) return STATUS.PATIENT_LOADED;
 
   return STATUS.STATE_CLEARED;
-}
+};
 
 const FETCH_PATIENT_OPTS = { forceDataWorkerAddDataRequest: true, useCache: false };
 
@@ -104,7 +106,7 @@ const useAgpCGM = (
     return () => {
       dispatch(actions.worker.removeGeneratedPDFS());
       dispatch(actions.worker.dataWorkerRemoveDataRequest(null, patientId));
-    }
+    };
   }, []);
 
   // Note: probably unnecessary; failsafe to ensure that data is being returned for correct patient
@@ -115,6 +117,6 @@ const useAgpCGM = (
     svgDataURLS: isCorrectPatientInState ? pdf.opts?.svgDataURLS : null,
     agpCGM:      isCorrectPatientInState ? pdf.data?.agpCGM : null,
   };
-}
+};
 
 export default useAgpCGM;
\ No newline at end of file

From cfe1f749f670f0fb86f821d52bb9e964dccf0cd7 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 15:08:36 -0300
Subject: [PATCH 24/39] remove accidental .only in tests

---
 app/pages/dashboard/PatientDrawer/Content.js                   | 3 ++-
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/Content.js b/app/pages/dashboard/PatientDrawer/Content.js
index 2365b46bce..2fbf2ab3bb 100644
--- a/app/pages/dashboard/PatientDrawer/Content.js
+++ b/app/pages/dashboard/PatientDrawer/Content.js
@@ -60,8 +60,9 @@ const Content = ({ api, patientId, agpPeriodInDays }) => {
   const patient = clinic?.patients?.[patientId];
 
   if (status === STATUS.NO_PATIENT_DATA)   return <NoPatientData patientName={patient?.fullName}/>;
-  if (status === STATUS.NO_CGM_DATA)    return <NoPatientData patientName={patient?.fullName}/>;
+  if (status === STATUS.NO_CGM_DATA)       return <InsufficientData />;
   if (status === STATUS.INSUFFICIENT_DATA) return <InsufficientData />;
+
   if (status !== STATUS.SVGS_GENERATED)    return <Loader show={true} overlay={false} />;
 
   const percentInRanges          = svgDataURLS?.agpCGM?.percentInRanges;
diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index 70a6e61296..5385b07a07 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -42,7 +42,7 @@ const pdf = {
   },
 };
 
-describe.only('PatientDrawer/MenuBar/CGMClipboardButton', () => {
+describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   CGMClipboardButton.__Rewire__('agpCGMText', sinon.stub().returns('AGP_DATA_STRING_TO_COPY'));
 
   const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');

From 0636891e39de8d3de660f2d4d252e5a9f142af67 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 15:37:16 -0300
Subject: [PATCH 25/39] use formatDateRange from viz

---
 .../CGMStatistics/getReportDaysText.js           | 16 +---------------
 .../PatientDrawer/CGMStatistics/index.js         |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
index f72dddef14..d055950b8e 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/getReportDaysText.js
@@ -2,21 +2,7 @@ import moment from 'moment';
 import { MS_IN_MIN } from '../../../../core/constants';
 import isNumber from 'lodash/isNumber';
 import { utils as vizUtils } from '@tidepool/viz';
-const { getOffset } = vizUtils.datetime;
-
-const formatDateRange = (startDate, endDate, dateParseFormat, monthFormat = 'MMM') => {
-  const start = moment.utc(startDate, dateParseFormat);
-  const end = moment.utc(endDate, dateParseFormat);
-
-  const isSameYear = start.isSame(end, 'year');
-  const isSameDay = start.isSame(end, 'day');
-  const startFormat = isSameYear ? start.format(`${monthFormat} D`) : start.format(`${monthFormat} D, YYYY`);
-  const endFormat = end.format(`${monthFormat} D, YYYY`);
-
-  const formattedRange = isSameDay ? endFormat : `${startFormat} - ${endFormat}`;
-
-  return formattedRange;
-};
+const { getOffset, formatDateRange } = vizUtils.datetime;
 
 const getDateRange = (startDate, endDate, dateParseFormat, _prefix, monthFormat, timezone) => {
   let start = startDate;
diff --git a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
index cec9456b39..e86c8e526e 100644
--- a/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
+++ b/app/pages/dashboard/PatientDrawer/CGMStatistics/index.js
@@ -53,7 +53,7 @@ const CGMStatistics = ({ agpCGM }) => {
           glucoseManagementIndicator: { glucoseManagementIndicatorAGP },
           coefficientOfVariation: { coefficientOfVariation },
         },
-      }
+      },
     },
   } = agpCGM;
 

From f34d8add43f5c91f09cb802ce77f5ffe72817833 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 17:08:01 -0300
Subject: [PATCH 26/39] move cgmstatistics tests into correct folder

---
 .../{CGMStatistics.test.js => CGMStatistics/index.test.js}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/unit/pages/dashboard/PatientDrawer/{CGMStatistics.test.js => CGMStatistics/index.test.js} (98%)

diff --git a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
similarity index 98%
rename from test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js
rename to test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
index 51c0da8616..ba863d0c31 100644
--- a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import _ from 'lodash';
 
-import CGMStatistics from '../../../../../app/pages/dashboard/PatientDrawer/CGMStatistics';
+import CGMStatistics from '../../../../../../app/pages/dashboard/PatientDrawer/CGMStatistics';
 
 const expect = chai.expect;
 

From b08099d18885f1fdf478a05e0f7c2f7dae502fff Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 17:47:22 -0300
Subject: [PATCH 27/39] remove import of lodash

---
 .../pages/dashboard/PatientDrawer/CGMStatistics/index.test.js    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
index ba863d0c31..226e47b9e5 100644
--- a/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/CGMStatistics/index.test.js
@@ -8,7 +8,6 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
-import _ from 'lodash';
 
 import CGMStatistics from '../../../../../../app/pages/dashboard/PatientDrawer/CGMStatistics';
 

From a986c42304546a646cc99dcd984431633708b9fb Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 18:58:57 -0300
Subject: [PATCH 28/39] bump viz

---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 8624571901..3a879aa745 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@storybook/react": "7.5.0",
     "@storybook/react-webpack5": "7.5.0",
     "@testing-library/react-hooks": "8.0.1",
-    "@tidepool/viz": "1.44.0",
+    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.1",
     "async": "2.6.4",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
diff --git a/yarn.lock b/yarn.lock
index 409e8a941f..18e1f042e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,9 +5278,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tidepool/viz@npm:1.44.0":
-  version: 1.44.0
-  resolution: "@tidepool/viz@npm:1.44.0"
+"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.1":
+  version: 1.45.0-web-3346-summary-accuracy.1
+  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.1"
   dependencies:
     bluebird: 3.7.2
     bows: 1.7.2
@@ -5340,7 +5340,7 @@ __metadata:
     react-dom: 16.x
     react-redux: 8.x
     redux: 4.x
-  checksum: b13d05ed26d030691f13ed56e42a1c212db0a2f4c69520ec4be386a2105e1fea4ac9bb444a4ffbfa41627ffd142fc422c64f8391da3af34622b01dc620b9ea07
+  checksum: 43b583ae2b17c9038ac41eb9eaba99a44f22a4c06c8deda42d4bfca406f56ddfc325c25d87ba0ecbfe4fcbaf00968f5670a91e1b09c8193cbd983319f4886ebf
   languageName: node
   linkType: hard
 
@@ -7305,7 +7305,7 @@ __metadata:
     "@storybook/react": 7.5.0
     "@storybook/react-webpack5": 7.5.0
     "@testing-library/react-hooks": 8.0.1
-    "@tidepool/viz": 1.44.0
+    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.1
     async: 2.6.4
     autoprefixer: 10.4.16
     babel-core: 7.0.0-bridge.0

From a92f231fbeddc5c9d8345bef52261bd64dbc2343 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 14 Jan 2025 19:14:56 -0300
Subject: [PATCH 29/39] remove NO_CGM_DATA error state

---
 app/pages/dashboard/PatientDrawer/Content.js             | 1 -
 app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/Content.js b/app/pages/dashboard/PatientDrawer/Content.js
index 2fbf2ab3bb..686eea9f62 100644
--- a/app/pages/dashboard/PatientDrawer/Content.js
+++ b/app/pages/dashboard/PatientDrawer/Content.js
@@ -60,7 +60,6 @@ const Content = ({ api, patientId, agpPeriodInDays }) => {
   const patient = clinic?.patients?.[patientId];
 
   if (status === STATUS.NO_PATIENT_DATA)   return <NoPatientData patientName={patient?.fullName}/>;
-  if (status === STATUS.NO_CGM_DATA)       return <InsufficientData />;
   if (status === STATUS.INSUFFICIENT_DATA) return <InsufficientData />;
 
   if (status !== STATUS.SVGS_GENERATED)    return <Loader show={true} overlay={false} />;
diff --git a/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js b/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
index a2e289c45c..3fc072d71e 100644
--- a/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
+++ b/app/pages/dashboard/PatientDrawer/useAgpCGM/useAgpCGM.js
@@ -37,7 +37,7 @@ const inferLastCompletedStep = (patientId, data, pdf) => {
 
   if (hasNoPatientData)    return STATUS.NO_PATIENT_DATA;
   if (hasInsufficientData) return STATUS.INSUFFICIENT_DATA;
-  if (hasNoCGMData)        return STATUS.NO_CGM_DATA;
+  if (hasNoCGMData)        return STATUS.INSUFFICIENT_DATA;
 
   // Happy Path States ---
   const hasImagesInState  = !!pdf?.opts?.svgDataURLS;

From 87d5987d2008681bca11d1154021ac6c661f5410 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Wed, 15 Jan 2025 09:50:36 -0800
Subject: [PATCH 30/39] trigger CI


From 05c61ae4f2cddf4805e3e2548dc5e07fdaf106f9 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 16 Jan 2025 09:22:11 -0800
Subject: [PATCH 31/39] bump viz

---
 package.json |   2 +-
 yarn.lock    | 761 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 423 insertions(+), 340 deletions(-)

diff --git a/package.json b/package.json
index 3a879aa745..06cb634cbf 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@storybook/react": "7.5.0",
     "@storybook/react-webpack5": "7.5.0",
     "@testing-library/react-hooks": "8.0.1",
-    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.1",
+    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.2",
     "async": "2.6.4",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
diff --git a/yarn.lock b/yarn.lock
index 18e1f042e0..b6f2c7069b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,9 +5278,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.1":
-  version: 1.45.0-web-3346-summary-accuracy.1
-  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.1"
+"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.2":
+  version: 1.45.0-web-3346-summary-accuracy.2
+  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.2"
   dependencies:
     bluebird: 3.7.2
     bows: 1.7.2
@@ -5329,18 +5329,18 @@ __metadata:
     text-table: 0.2.0
     translate-svg-path: 0.0.1
     util: 0.12.5
-    victory: 31.3.0
-    victory-core: 31.2.0
+    victory: 37.3.5
+    victory-core: 37.3.5
     voilab-pdf-table: 0.5.1
   peerDependencies:
     babel-core: 6.x || ^7.0.0-bridge.0
     classnames: 2.x
     react: 16.x
-    react-addons-update: 16.x
+    react-addons-update: 15.6.x
     react-dom: 16.x
     react-redux: 8.x
     redux: 4.x
-  checksum: 43b583ae2b17c9038ac41eb9eaba99a44f22a4c06c8deda42d4bfca406f56ddfc325c25d87ba0ecbfe4fcbaf00968f5670a91e1b09c8193cbd983319f4886ebf
+  checksum: 827386728969d68d4fd68e3c9e56988efc842216201325b455bab0bd5b13b66ec4e78809f89dd1aa5ff6a88e620786d8bc16e65b5c45dbd2404229057f882e2e
   languageName: node
   linkType: hard
 
@@ -5469,6 +5469,75 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/d3-array@npm:^3.0.3":
+  version: 3.2.1
+  resolution: "@types/d3-array@npm:3.2.1"
+  checksum: 8a41cee0969e53bab3f56cc15c4e6c9d76868d6daecb2b7d8c9ce71e0ececccc5a8239697cc52dadf5c665f287426de5c8ef31a49e7ad0f36e8846889a383df4
+  languageName: node
+  linkType: hard
+
+"@types/d3-color@npm:*":
+  version: 3.1.3
+  resolution: "@types/d3-color@npm:3.1.3"
+  checksum: 8a0e79a709929502ec4effcee2c786465b9aec51b653ba0b5d05dbfec3e84f418270dd603002d94021885061ff592f614979193bd7a02ad76317f5608560e357
+  languageName: node
+  linkType: hard
+
+"@types/d3-ease@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/d3-ease@npm:3.0.2"
+  checksum: 0885219966294bfc99548f37297e1c75e75da812a5f3ec941977ebb57dcab0a25acec5b2bbd82d09a49d387daafca08521ca269b7e4c27ddca7768189e987b54
+  languageName: node
+  linkType: hard
+
+"@types/d3-interpolate@npm:^3.0.1":
+  version: 3.0.4
+  resolution: "@types/d3-interpolate@npm:3.0.4"
+  dependencies:
+    "@types/d3-color": "*"
+  checksum: efd2770e174e84fc7316fdafe03cf3688451f767dde1fa6211610137f495be7f3923db7e1723a6961a0e0e9ae0ed969f4f47c038189fa0beb1d556b447922622
+  languageName: node
+  linkType: hard
+
+"@types/d3-path@npm:*":
+  version: 3.1.0
+  resolution: "@types/d3-path@npm:3.1.0"
+  checksum: 1e81b56ed33ba1ac954a8c42c78c3fcf2716927fe5d01b2003591193ad3b639572a3dfcedd9bf78b6b73215a5cfb01cede8f25c936e95ac18fbe3858f9b62f5c
+  languageName: node
+  linkType: hard
+
+"@types/d3-scale@npm:^4.0.2":
+  version: 4.0.8
+  resolution: "@types/d3-scale@npm:4.0.8"
+  dependencies:
+    "@types/d3-time": "*"
+  checksum: 3b1906da895564f73bb3d0415033d9a8aefe7c4f516f970176d5b2ff7a417bd27ae98486e9a9aa0472001dc9885a9204279a1973a985553bdb3ee9bbc1b94018
+  languageName: node
+  linkType: hard
+
+"@types/d3-shape@npm:^3.1.0":
+  version: 3.1.7
+  resolution: "@types/d3-shape@npm:3.1.7"
+  dependencies:
+    "@types/d3-path": "*"
+  checksum: 776b982e2c4fc04763782af5100993c02bca338632ff2c76d2423ace398300ba7c48cd745f95b5f51edefabbfd026c45829a146c411f8facde09ef92580b20ce
+  languageName: node
+  linkType: hard
+
+"@types/d3-time@npm:*, @types/d3-time@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "@types/d3-time@npm:3.0.4"
+  checksum: 0c296884571ce70c4bbd4ea9cd1c93c0c8aee602c6c806b056187dd4ee49daf70c2f41da94b25ba0d796edf8ca83cbb87fe6d1cdda7ca669ab800170ece1c12b
+  languageName: node
+  linkType: hard
+
+"@types/d3-timer@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/d3-timer@npm:3.0.2"
+  checksum: 1643eebfa5f4ae3eb00b556bbc509444d88078208ec2589ddd8e4a24f230dd4cf2301e9365947e70b1bee33f63aaefab84cd907822aae812b9bc4871b98ab0e1
+  languageName: node
+  linkType: hard
+
 "@types/debug@npm:^4.0.0":
   version: 4.1.12
   resolution: "@types/debug@npm:4.1.12"
@@ -7305,7 +7374,7 @@ __metadata:
     "@storybook/react": 7.5.0
     "@storybook/react-webpack5": 7.5.0
     "@testing-library/react-hooks": 8.0.1
-    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.1
+    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.2
     async: 2.6.4
     autoprefixer: 10.4.16
     babel-core: 7.0.0-bridge.0
@@ -8984,7 +9053,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:3.2.4":
+"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3, d3-array@npm:3.2.4, d3-array@npm:^3.1.6":
   version: 3.2.4
   resolution: "d3-array@npm:3.2.4"
   dependencies:
@@ -8993,27 +9062,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-array@npm:^1.2.0":
-  version: 1.2.4
-  resolution: "d3-array@npm:1.2.4"
-  checksum: d0be1fa7d72dbfac8a3bcffbb669d42bcb9128d8818d84d2b1df0c60bbe4c8e54a798be0457c55a219b399e2c2fabcbd581cbb130eb638b5436b0618d7e56000
-  languageName: node
-  linkType: hard
-
-"d3-collection@npm:1":
-  version: 1.0.7
-  resolution: "d3-collection@npm:1.0.7"
-  checksum: 9c6b910a9da0efb021e294509f98263ca4f62d10b997bb30ccfb6edd582b703da36e176b968b5bac815fbb0f328e49643c38cf93b5edf8572a179ba55cf4a09d
-  languageName: node
-  linkType: hard
-
-"d3-color@npm:1":
-  version: 1.4.1
-  resolution: "d3-color@npm:1.4.1"
-  checksum: a214b61458b5fcb7ad1a84faed0e02918037bab6be37f2d437bf0e2915cbd854d89fbf93754f17b0781c89e39d46704633d05a2bfae77e6209f0f4b140f9894b
-  languageName: node
-  linkType: hard
-
 "d3-color@npm:1 - 3":
   version: 3.1.0
   resolution: "d3-color@npm:3.1.0"
@@ -9021,17 +9069,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-ease@npm:^1.0.0":
-  version: 1.0.7
-  resolution: "d3-ease@npm:1.0.7"
-  checksum: 117811d51dfc4a126e8d23d249252df792fbbe30a93615e1d67158c482eff69b900e45a4cc92746fe65b1143287455406a89aae04eb4ca1ba5b1dc2a42af5b85
-  languageName: node
-  linkType: hard
-
-"d3-format@npm:1":
-  version: 1.4.5
-  resolution: "d3-format@npm:1.4.5"
-  checksum: 1b8b2c0bca182173bccd290a43e8b635a83fc8cfe52ec878c7bdabb997d47daac11f2b175cebbe73f807f782ad655f542bdfe18180ca5eb3498a3a82da1e06ab
+"d3-ease@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "d3-ease@npm:3.0.1"
+  checksum: 06e2ee5326d1e3545eab4e2c0f84046a123dcd3b612e68858219aa034da1160333d9ce3da20a1d3486d98cb5c2a06f7d233eee1bc19ce42d1533458bd85dedcd
   languageName: node
   linkType: hard
 
@@ -9042,16 +9083,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-interpolate@npm:1, d3-interpolate@npm:^1.1.1":
-  version: 1.4.0
-  resolution: "d3-interpolate@npm:1.4.0"
-  dependencies:
-    d3-color: 1
-  checksum: d98988bd1e2f59d01f100d0a19315ad8f82ef022aa09a65aff76f747a44f9b52f2d64c6578b8f47e01f2b14a8f0ef88f5460d11173c0dd2d58238c217ac0ec03
-  languageName: node
-  linkType: hard
-
-"d3-interpolate@npm:1.2.0 - 3":
+"d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:^3.0.1":
   version: 3.0.1
   resolution: "d3-interpolate@npm:3.0.1"
   dependencies:
@@ -9060,13 +9092,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-path@npm:1":
-  version: 1.0.9
-  resolution: "d3-path@npm:1.0.9"
-  checksum: d4382573baf9509a143f40944baeff9fead136926aed6872f7ead5b3555d68925f8a37935841dd51f1d70b65a294fe35c065b0906fb6e42109295f6598fc16d0
-  languageName: node
-  linkType: hard
-
 "d3-path@npm:^3.1.0":
   version: 3.1.0
   resolution: "d3-path@npm:3.1.0"
@@ -9074,7 +9099,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-scale@npm:4.0.2":
+"d3-scale@npm:4.0.2, d3-scale@npm:^4.0.2":
   version: 4.0.2
   resolution: "d3-scale@npm:4.0.2"
   dependencies:
@@ -9087,22 +9112,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-scale@npm:^1.0.0":
-  version: 1.0.7
-  resolution: "d3-scale@npm:1.0.7"
-  dependencies:
-    d3-array: ^1.2.0
-    d3-collection: 1
-    d3-color: 1
-    d3-format: 1
-    d3-interpolate: 1
-    d3-time: 1
-    d3-time-format: 2
-  checksum: c889c510aa0380b23e3a595be6b143b7053351ab6fe212918aa1ae80353a9ccde81064c2afa95dbdcd936fbb0c69dd560de291cbbea80d068a4390a3f67596aa
-  languageName: node
-  linkType: hard
-
-"d3-shape@npm:3.2.0":
+"d3-shape@npm:3.2.0, d3-shape@npm:^3.1.0":
   version: 3.2.0
   resolution: "d3-shape@npm:3.2.0"
   dependencies:
@@ -9111,24 +9121,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-shape@npm:^1.0.0, d3-shape@npm:^1.2.0":
-  version: 1.3.7
-  resolution: "d3-shape@npm:1.3.7"
-  dependencies:
-    d3-path: 1
-  checksum: 46566a3ab64a25023653bf59d64e81e9e6c987e95be985d81c5cedabae5838bd55f4a201a6b69069ca862eb63594cd263cac9034afc2b0e5664dfe286c866129
-  languageName: node
-  linkType: hard
-
-"d3-time-format@npm:2":
-  version: 2.3.0
-  resolution: "d3-time-format@npm:2.3.0"
-  dependencies:
-    d3-time: 1
-  checksum: 5445eaaf2b3b2095cdc1fa75dfd2f361a61c39b677dcc1c2ba4cb6bc0442953de0fbaaa397d7d7a9325ad99c63d869f162a713e150e826ff8af482615664cb3f
-  languageName: node
-  linkType: hard
-
 "d3-time-format@npm:2 - 4, d3-time-format@npm:4.1.0":
   version: 4.1.0
   resolution: "d3-time-format@npm:4.1.0"
@@ -9138,14 +9130,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-time@npm:1":
-  version: 1.1.0
-  resolution: "d3-time@npm:1.1.0"
-  checksum: 33fcfff94ff093dde2048c190ecca8b39fe0ec8b3c61e9fc39c5f6072ce5b86dd2b91823f086366995422bbbac7f74fd9abdb7efe4f292a73b1c6197c699cc78
-  languageName: node
-  linkType: hard
-
-"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3.1.0":
+"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3, d3-time@npm:3.1.0, d3-time@npm:^3.0.0":
   version: 3.1.0
   resolution: "d3-time@npm:3.1.0"
   dependencies:
@@ -9154,14 +9139,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-timer@npm:^1.0.0":
-  version: 1.0.10
-  resolution: "d3-timer@npm:1.0.10"
-  checksum: f7040953672deb2dfa03830ace80dbbcb212f80890218eba15dcca6f33f74102d943023ccc2a563295195cd8c63639bb2410ef1691c8fecff4a114fdf5c666f4
+"d3-timer@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "d3-timer@npm:3.0.1"
+  checksum: 1cfddf86d7bca22f73f2c427f52dfa35c49f50d64e187eb788dcad6e927625c636aa18ae4edd44d084eb9d1f81d8ca4ec305dae7f733c15846a824575b789d73
   languageName: node
   linkType: hard
 
-"d3-voronoi@npm:^1.1.2":
+"d3-voronoi@npm:^1.1.4":
   version: 1.1.4
   resolution: "d3-voronoi@npm:1.1.4"
   checksum: d28a74bc62f2b936b0d3b51d5be8d2366afca4fd7026d7ee8f655600650bf0c985da38a8c3ae46bfa315b5f524f3ca1c5211437cf1c8c737cc1da681e015baee
@@ -9478,6 +9463,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"delaunator@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "delaunator@npm:4.0.1"
+  checksum: a49f1c23edbcb79079a13577d32fcd46d0db30879c8484f742a0d840923085f2f3de35a9bfbb96eadd12201ffb7c3adf45b0f528d08b71cb547c5f8068b5d61b
+  languageName: node
+  linkType: hard
+
+"delaunay-find@npm:0.0.6":
+  version: 0.0.6
+  resolution: "delaunay-find@npm:0.0.6"
+  dependencies:
+    delaunator: ^4.0.0
+  checksum: 072e197a4317dd06ff8349dfa6731f62d322c7ba4697d4a323da7798676f5c429c4ac691ae5207f7c7da567eca7c71dada896206cbd7995e6e9d145101734c31
+  languageName: node
+  linkType: hard
+
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
@@ -17264,7 +17265,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-fast-compare@npm:^2.0.0, react-fast-compare@npm:^2.0.1":
+"react-fast-compare@npm:^2.0.1":
   version: 2.0.4
   resolution: "react-fast-compare@npm:2.0.4"
   checksum: 06046595f90a4e3e3a56f40a8078c00aa71bdb064ddb98343f577f546aa22e888831fd45f009c93b34707cc842b4c637737e956fd13d6f80607ee92fb9cf9a1c
@@ -21091,335 +21092,417 @@ __metadata:
   languageName: node
   linkType: hard
 
-"victory-area@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-area@npm:31.2.0"
+"victory-area@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-area@npm:37.3.5"
   dependencies:
-    d3-shape: ^1.2.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 56267af197297232c04f832463a28fe148d6bda5f29d82a49fbecd49f2cd35b486d9288a445ba67a3ab4c265f2d77c267dcdf96ac68f1fffbc7ea446b10166ae
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: c6769023a4d657d8cf03e7eaddf7edc5ddb70269e74c8a13f6bd247a42eb4677b205c5094ddd14dfd33694d401744efa8998ded38ce930e25d1d44f4d34f0957
   languageName: node
   linkType: hard
 
-"victory-axis@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-axis@npm:31.2.0"
+"victory-axis@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-axis@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: dea086b8ec43be8790f6806a0ff522892daa2b1d430bb338befd7f7c04a11307e95b77c18f89433f428b914cd745fce58e31d7f25f147cfc14e8401497447748
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 2011097a9241ce43dce8cfdf1018977b4a958093a661edcf88849215336b792a9ccf9bb9851605a20f2752c87c5b5fb82cb9c86dcdf5943450faa73a7f5f9052
   languageName: node
   linkType: hard
 
-"victory-bar@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-bar@npm:31.2.0"
+"victory-bar@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-bar@npm:37.3.5"
   dependencies:
-    d3-shape: ^1.2.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: b622759f818c682777caa2d7d7c1ed99cabc34280c91656d12268fdac67a0a5cbf2ed9b0b5a79a7ea4dd919ad231da44987eecd7f9e8ce61ffc7865c91fd9299
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: be1c95b8c1320eac20bff9504f579e2eb5e7f1fed7d8363246194535b8dc7e0316a2b62cdeac4bb43898adc93345a28ee946014ef7015206b4f85543ef2ee365
   languageName: node
   linkType: hard
 
-"victory-box-plot@npm:^31.3.0":
-  version: 31.3.0
-  resolution: "victory-box-plot@npm:31.3.0"
+"victory-box-plot@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-box-plot@npm:37.3.5"
   dependencies:
-    d3-array: ^1.2.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: a5b18b7c378236cf30e3a21786c02e866885613a603040f79d06403eed0b0631bbcb60e004a3b0cc8afea01c76dd127b106f524c6feb85c839f918855026248b
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 93c8bf2fd523be7f1c30d67fe7574ead43f2e63f914094f27ebd61bebf219dbd2e0f8f4e8382d6eee2aec4bb0261463e8801384145e86c5fdadc2c37fb22c280
   languageName: node
   linkType: hard
 
-"victory-brush-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-brush-container@npm:31.2.0"
+"victory-brush-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-brush-container@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: b4749b5ee388c1c5d247234276198cae3c23eff13315181c0b8d7737ffffbe757187d4550bf7e8bd8c9321d67d26e685b859189cfb241fda15b1185438f40ba7
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 73f989ecd527440c5409282256b8ed2f7425baf17727e3d98286915fc424106cf62320167d3d11c03bba80154a6611235eb1a9ece3b568c92897b1378be158f5
   languageName: node
   linkType: hard
 
-"victory-brush-line@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-brush-line@npm:31.2.0"
+"victory-brush-line@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-brush-line@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: a6a060b17102b8149a94f83e94c72f06eb877bba7c5e5154190c85890ed01565b7087604c5f580d7ac5479fee6ecb9e41045f3f2749453debdd9a68de82aff5c
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: d544fc2c668b048b7d1896fc699e876b2df29882df7272bda917f149a3e2c2947686d06c5c871c67a8f999dd438eab91432aa62fb84e97fab6be05293f5bf7e9
   languageName: node
   linkType: hard
 
-"victory-candlestick@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-candlestick@npm:31.2.0"
+"victory-candlestick@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-candlestick@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 95cf304d8ae8c50087cd094c1e18dd73a453da91b75333cddf427f7906672e1163cd195e10b1b3373d1f2a4f9084d8046928d1c544e4ce1c2c1a9ca31269cf21
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 60b91488cb29b6d68fd724c3248274f0c6590c16e833bb85b1fbaa64e0f56791e081fce963ff90ec054da64348212d74b6f5ea337f4e1667b5494a2f6d173e90
   languageName: node
   linkType: hard
 
-"victory-chart@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-chart@npm:31.2.0"
+"victory-canvas@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-canvas@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-fast-compare: ^2.0.0
-    victory-axis: ^31.2.0
-    victory-core: ^31.2.0
-    victory-polar-axis: ^31.2.0
-    victory-shared-events: ^31.2.0
-  checksum: 88a8861f2fae6edf38b65285990bc6a8e8026303b9e302e70a233d90d1f684d08e5bd3f06eb5ac01300ce3b1f37c8aa2f8bad2d8797e9eee75da03169eddf8d2
+    lodash: ^4.17.19
+    victory-bar: 37.3.5
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 4358554efddf4eb23326aaedb68b393925d2483cfe2dbad7163c28185de3fef4cf12011b6fdad1bddccc8dbe71c2450dc1af349dfc73e48cfb8103de9f854ea6
   languageName: node
   linkType: hard
 
-"victory-core@npm:31.2.0, victory-core@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-core@npm:31.2.0"
+"victory-chart@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-chart@npm:37.3.5"
   dependencies:
-    d3-ease: ^1.0.0
-    d3-interpolate: ^1.1.1
-    d3-scale: ^1.0.0
-    d3-shape: ^1.2.0
-    d3-timer: ^1.0.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-fast-compare: ^2.0.0
-  checksum: 0b590c282a58c20f20218e97f7031cfd427c8aa6dbe08dfe169127a13d1873ef5c715015ff69c25e18e97eeaf142c2dfc3d5f89aa9eb501887c20173223ff159
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-axis: 37.3.5
+    victory-core: 37.3.5
+    victory-polar-axis: 37.3.5
+    victory-shared-events: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 44d42fafac9a108b0641817e937834d88085ebc4857236ff4c92bd02d858c4243e1e6525a34ec41718d993583bb869182ef3153278a20e71d9986691b7674b54
   languageName: node
   linkType: hard
 
-"victory-create-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-create-container@npm:31.2.0"
+"victory-core@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-core@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    victory-brush-container: ^31.2.0
-    victory-core: ^31.2.0
-    victory-cursor-container: ^31.2.0
-    victory-selection-container: ^31.2.0
-    victory-voronoi-container: ^31.2.0
-    victory-zoom-container: ^31.2.0
-  checksum: 014ecaac7415c0dace1664127b203e994720de58521f78f08e7b7f080ad8c97fdc3aa16b9ee97c4ee755bb55a411e42109d9f3d34ff164347ecd9c7d4e6eb855
+    lodash: ^4.17.21
+    react-fast-compare: ^3.2.0
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: cb021419e6cfee495868b7a2e419235b6858f2d17b0a1ab2a7b79429e759e836985a04a9ca8446aa928e76d51f185cedd4eae82204168e4b3420084a429f1533
   languageName: node
   linkType: hard
 
-"victory-cursor-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-cursor-container@npm:31.2.0"
+"victory-create-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-create-container@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 9c400c95702f4ce27992b943841a228a974a17b69124e3e482d45c7e6ad0f7f17ae5d528db48e260f0b1c96cba652d469fa306b4b7ea53e67bfbe046d79d347b
+    lodash: ^4.17.19
+    victory-brush-container: 37.3.5
+    victory-core: 37.3.5
+    victory-cursor-container: 37.3.5
+    victory-selection-container: 37.3.5
+    victory-voronoi-container: 37.3.5
+    victory-zoom-container: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: f7b946245f0cc2cb7017521902a892d603006e00ca73190c7a1ccd335c3367db9c4af4bd3c28e3b03a345800b39a5dc8ef00efc7032f92827df09aa0b6d962e6
   languageName: node
   linkType: hard
 
-"victory-errorbar@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-errorbar@npm:31.2.0"
+"victory-cursor-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-cursor-container@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 2cee41517b24cd92141d6afdac7fbd2ba465f6c5ef92ecf71a36a542808ed068c42800b49f3293cb28c6161ce1eccc507f5bab7c11d88a7b93715dfd16ae3f3b
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: f5b2224e9a920909287f79ac7978f44bd6eabb3394afc79116cd7e452368575e1e7e6907ce7f0a5626aa826b5bdebe4c7684402eab69fb9b93b1da42f76e1ce2
   languageName: node
   linkType: hard
 
-"victory-group@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-group@npm:31.2.0"
+"victory-errorbar@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-errorbar@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-fast-compare: ^2.0.0
-    victory-core: ^31.2.0
-  checksum: d457c7309e1d59897c3647b9efadfa29015ec8d57d5c4813093efa925c28c06091b68dfca6d9fc6f432663cb98c7614626123ef0c2617bbfed65ddc7948edf20
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: c3008f16ef98e0447545e1a060a9c6a7849693c815e0b2e148877e79937d94e2554204e4f8ae3eb30cff0570232df5e181313fa925fb81b4f963cb83d128fe87
   languageName: node
   linkType: hard
 
-"victory-legend@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-legend@npm:31.2.0"
+"victory-group@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-group@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 20edeeeb4ff421e5fed166dbd55207da7ad2dfa644ec12b98c8612d3e428267fee2df9b92bf6581ca57a38a7e16a1aeb15fe9819794a5e9bc11fed26562c14df
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+    victory-shared-events: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 0b661a9d4fa8dfd4674f9461883eedc4b4755659803e5d249b63df13a5c9ac1f75e00a23d4d8f80a1c34f30ac467aa8a0b509bfb978d9211814ca7fc0c53e304
   languageName: node
   linkType: hard
 
-"victory-line@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-line@npm:31.2.0"
+"victory-histogram@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-histogram@npm:37.3.5"
   dependencies:
-    d3-shape: ^1.2.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: b460f98167553c131f2ecf31caac8744b09bce9762e75ba87caf4d9e29cdfba8c5a4ec1ffc283ada0cab344bcfd33c9a85d1d7603c3fcde6d4052f2faa940003
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-bar: 37.3.5
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 62e55975eb9d64fbcbf1af41eb5115bfc6d79e788e8171445cd38006147320576d385e01c643e2c0cb4a2ae087c7fa2f076e885a2c2dbfda53ff10a4f7996746
   languageName: node
   linkType: hard
 
-"victory-pie@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-pie@npm:31.2.0"
+"victory-legend@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-legend@npm:37.3.5"
   dependencies:
-    d3-shape: ^1.0.0
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 333f2aeb099cb3cb4b3d6da49c1cb3a576be9b2f87faf032475e7689b291c12643b672c683751e2c86931da2b64e7d243c30215f083f562e5ac460744dad2ada
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 53a06bfef56066a0cfffcca54233f40befaebd6cfa96e014e09d6691bb59789225fb19652f43ec4de25acc62cbde8e89d34aa7c7196e838d459134542cb1aa4e
   languageName: node
   linkType: hard
 
-"victory-polar-axis@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-polar-axis@npm:31.2.0"
+"victory-line@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-line@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: b13e62c2b32228054a7acc5dac1a3bfc76b8596fa48bb78378b1b32ce9c44e5dcd928b0fd2685655f7f3b298c086aecde8fd876c5f5844a7ee526f20aafcee77
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: d602a12e759ee59d542acc82de25c5910833cf03836d12d9ef8ab026a954baddc2df60d331cfbf6b44eb1617da543f6d2f11a8cce43038d94eeb2a8db16d022c
   languageName: node
   linkType: hard
 
-"victory-scatter@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-scatter@npm:31.2.0"
+"victory-pie@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-pie@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: 36801a195b208be4bac40b0bb5664e32322ced09dc4322bc84c76e006881ae39f44d16a9958c74f26f6165b7abb527db88bc6436873c31da1cf078f831dd0bf3
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+    victory-vendor: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: ce4054abf483c654298271e693202945402b9e38dc1fb98827701277a1b14cde5c5f77fc04b497de4603dc133665bf104679e47734d24ce2bf2d45eb84ca4922
   languageName: node
   linkType: hard
 
-"victory-selection-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-selection-container@npm:31.2.0"
+"victory-polar-axis@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-polar-axis@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: f5214c645b306ec05fefb8cb38b98218854fec85142cabb89ccea5004fc2473a3cd6092d64dce6e22727b3b5567f77de649c16e8a6168ebdd21d91d53d400aaa
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 506f8f1be5762afe16bb0e5fbb329b511e5b676524ffba3a82ecd39e1532864f280e6ebf723824a856fd1c86e633cba5deecf2a6dcf9d20203aca52940f9b303
   languageName: node
   linkType: hard
 
-"victory-shared-events@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-shared-events@npm:31.2.0"
+"victory-scatter@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-scatter@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-fast-compare: ^2.0.0
-    victory-core: ^31.2.0
-  checksum: aacf20f75c56a6dc9e2c403756b12c398b6300c42a796d9b8816336a6021c7533e044546239f0707432cf558a58cf3c5dd7324e2a4a67a8584111fac2648b3dc
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 3f0908b34646e31232e6d728633b5f0e652830c7f2f3eec7f91354575677ce236e31a317a59bf80f5f80cf8cc2adb3b20595f4a3280d3fd976a18f2d79fb8c55
   languageName: node
   linkType: hard
 
-"victory-stack@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-stack@npm:31.2.0"
+"victory-selection-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-selection-container@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-fast-compare: ^2.0.0
-    victory-core: ^31.2.0
-  checksum: 2f5212c9572c13a4b48df9d6e6ea18178b8dbcd934226fa0301794f1ee24d2e06fc3e4495a8e3aa8d924fa0a08c6bc4fd1e8f38ebe84cff8fcfe1b62aa687025
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: d98f220a74e6c3ff417a0c991eede28d78acca4cf97f86dcce2c9a966b5d084cdd2cd5a67c4dbb5da23d064ee808f3adb8b206401c3012a41f63973b237293b0
   languageName: node
   linkType: hard
 
-"victory-tooltip@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-tooltip@npm:31.2.0"
+"victory-shared-events@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-shared-events@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: b2090a3fb0726331139d4ac79b74fe9de2062297946584b50c6593e588645109cbf4080b5154fa713d9045fb093ff02b9deeaaf0f4fa39bd1a01613115d95f28
+    json-stringify-safe: ^5.0.1
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 01a61c1a94c979a22d52c90fd834d24728bb23664ac30ee161d62ce34f41f782d90956c5f345d4b3b7e598d903584eb026a244ea19d6208c99956bcd06be8e0f
   languageName: node
   linkType: hard
 
-"victory-voronoi-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-voronoi-container@npm:31.2.0"
+"victory-stack@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-stack@npm:37.3.5"
   dependencies:
-    d3-voronoi: ^1.1.2
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-    victory-tooltip: ^31.2.0
-  checksum: 58fd0f90836abe1788af7168ffa52a3dc0b7f660f5cd0b4ad1b87ad0a7053cc762102c85bfae06e1e5a7bd80acf7df707028e3093a3ed4185f7d906a84f31dea
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+    victory-shared-events: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 3eedf72b2c35fdd9ade500075230478a641041f677ec384d8e3fcaafebd4b2bc12bd8c49d10c8c0b94916d8ece1217bbe3808ec38af08679bc486724390127e8
   languageName: node
   linkType: hard
 
-"victory-voronoi@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-voronoi@npm:31.2.0"
+"victory-tooltip@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-tooltip@npm:37.3.5"
   dependencies:
-    d3-voronoi: ^1.1.2
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: bb95d83b0910422ea9f0135ceeea01996d866bd8308231a443be051b217f7b7397b6d0b37d88b1cffae85f20bdcf82ecfb2bdb15e09f1e9cdf7b19eb53b27c9e
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 76b78b8673972d146dd6ca4b7e2b7612bb505c598d478126bcbd172bb8cceb54809cafdb02598d5ef242b7fc1735fb07dff1159a340501402b57a16f790b22d9
   languageName: node
   linkType: hard
 
-"victory-zoom-container@npm:^31.2.0":
-  version: 31.2.0
-  resolution: "victory-zoom-container@npm:31.2.0"
+"victory-vendor@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-vendor@npm:37.3.5"
   dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    victory-core: ^31.2.0
-  checksum: e0e1d2d92d09a572fc67f570f74b59e19de856f6379e3ee8464b36acbaa388eacb04cb1c97c4f03387ff0168b8ebada4d9bc26eff62b76224f7f56de485aff22
-  languageName: node
-  linkType: hard
-
-"victory@npm:31.3.0":
-  version: 31.3.0
-  resolution: "victory@npm:31.3.0"
-  dependencies:
-    victory-area: ^31.2.0
-    victory-axis: ^31.2.0
-    victory-bar: ^31.2.0
-    victory-box-plot: ^31.3.0
-    victory-brush-container: ^31.2.0
-    victory-brush-line: ^31.2.0
-    victory-candlestick: ^31.2.0
-    victory-chart: ^31.2.0
-    victory-core: ^31.2.0
-    victory-create-container: ^31.2.0
-    victory-cursor-container: ^31.2.0
-    victory-errorbar: ^31.2.0
-    victory-group: ^31.2.0
-    victory-legend: ^31.2.0
-    victory-line: ^31.2.0
-    victory-pie: ^31.2.0
-    victory-polar-axis: ^31.2.0
-    victory-scatter: ^31.2.0
-    victory-selection-container: ^31.2.0
-    victory-shared-events: ^31.2.0
-    victory-stack: ^31.2.0
-    victory-tooltip: ^31.2.0
-    victory-voronoi: ^31.2.0
-    victory-voronoi-container: ^31.2.0
-    victory-zoom-container: ^31.2.0
-  checksum: f73c720aa2dda91418c5d2317b30b92aaf5ae9ebd726fa1fb472ef4ef5d98df2651b7007f600a0d9b3b826eee56a08e436a4e064b446ec6a685fff2108f17c1d
+    "@types/d3-array": ^3.0.3
+    "@types/d3-ease": ^3.0.0
+    "@types/d3-interpolate": ^3.0.1
+    "@types/d3-scale": ^4.0.2
+    "@types/d3-shape": ^3.1.0
+    "@types/d3-time": ^3.0.0
+    "@types/d3-timer": ^3.0.0
+    d3-array: ^3.1.6
+    d3-ease: ^3.0.1
+    d3-interpolate: ^3.0.1
+    d3-scale: ^4.0.2
+    d3-shape: ^3.1.0
+    d3-time: ^3.0.0
+    d3-timer: ^3.0.1
+  checksum: 6dfd0dc0e8c1eaade896b472c7e8d9977ca751be88fb478f2a6eec34dd5d6412be4410399550f4096de47c36af968910f8d67892d0c1a5242b057d5b5ca3a5dc
+  languageName: node
+  linkType: hard
+
+"victory-voronoi-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-voronoi-container@npm:37.3.5"
+  dependencies:
+    delaunay-find: 0.0.6
+    lodash: ^4.17.19
+    react-fast-compare: ^3.2.0
+    victory-core: 37.3.5
+    victory-tooltip: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: e02199145961851c4377296413e0b780ec617c7c1139a7fbe2cce90299487c50e756011a7c4f1347f3fecc7a5df915d5430eff00bc555526dae806dbe4c820cd
+  languageName: node
+  linkType: hard
+
+"victory-voronoi@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-voronoi@npm:37.3.5"
+  dependencies:
+    d3-voronoi: ^1.1.4
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 343e6a3ae12960f07fa221e12265e75d1d1cf80a6e0ddb84e1f4bb38ae3f252dd6af4dde74a4f426abb2a226570a12af8a6291caabaacf680782267a537190cc
+  languageName: node
+  linkType: hard
+
+"victory-zoom-container@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory-zoom-container@npm:37.3.5"
+  dependencies:
+    lodash: ^4.17.19
+    victory-core: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 9ab47aa2934c3e062c5259f1456d7071c05337db9c54b3d35e25d8ae78a82e28878a7ae73f1071aff5ff3e0b0d733825293fe9e2dfdd99dfa96e7f25fb59c6e8
+  languageName: node
+  linkType: hard
+
+"victory@npm:37.3.5":
+  version: 37.3.5
+  resolution: "victory@npm:37.3.5"
+  dependencies:
+    victory-area: 37.3.5
+    victory-axis: 37.3.5
+    victory-bar: 37.3.5
+    victory-box-plot: 37.3.5
+    victory-brush-container: 37.3.5
+    victory-brush-line: 37.3.5
+    victory-candlestick: 37.3.5
+    victory-canvas: 37.3.5
+    victory-chart: 37.3.5
+    victory-core: 37.3.5
+    victory-create-container: 37.3.5
+    victory-cursor-container: 37.3.5
+    victory-errorbar: 37.3.5
+    victory-group: 37.3.5
+    victory-histogram: 37.3.5
+    victory-legend: 37.3.5
+    victory-line: 37.3.5
+    victory-pie: 37.3.5
+    victory-polar-axis: 37.3.5
+    victory-scatter: 37.3.5
+    victory-selection-container: 37.3.5
+    victory-shared-events: 37.3.5
+    victory-stack: 37.3.5
+    victory-tooltip: 37.3.5
+    victory-voronoi: 37.3.5
+    victory-voronoi-container: 37.3.5
+    victory-zoom-container: 37.3.5
+  peerDependencies:
+    react: ">=16.6.0"
+  checksum: 6693417c580810bfc59b70b6fa386d58214b4d3e14c2e10a067a83caf800a3fb93b89671d01e634b6dc84d60dc3a1781836ec6df6786c5ef21ba692ca43c84c3
   languageName: node
   linkType: hard
 

From 0ef24660c7a9c5b1ee57a5f1cfcd340cdf5a9fef Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 16 Jan 2025 09:57:30 -0800
Subject: [PATCH 32/39] add chart=trends searchParam when showTideDashboard is
 true

---
 app/components/navpatientheader/index.js | 34 ++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/components/navpatientheader/index.js b/app/components/navpatientheader/index.js
index f2e35a6534..0d4d255588 100644
--- a/app/components/navpatientheader/index.js
+++ b/app/components/navpatientheader/index.js
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
+import { useFlags } from 'launchdarkly-react-client-sdk';
 import { Box, Flex } from 'theme-ui';
 import _ from 'lodash';
 import launchCustomProtocol from 'custom-protocol-detection';
@@ -30,47 +31,52 @@ const HeaderContainer = ({ children }) => (
 );
 
 const NavPatientHeader = ({ 
-  patient, 
-  user, 
+  patient,
+  user,
   permsOfLoggedInUser,
   trackMetric,
-  clinicFlowActive, 
-  selectedClinicId, 
-  query, 
+  clinicFlowActive,
+  selectedClinicId,
 }) => {
   const history = useHistory();
+  const { query } = useLocation();
+  const { showTideDashboard } = useFlags();
   const [isUploadOverlayOpen, setIsUploadOverlayOpen] = useState(false);
 
   if (!patient?.profile) return null;
 
-  const { patientListLink } = getPatientListLink(clinicFlowActive, selectedClinicId, query, patient.userid);
+  const { patientListLink } = getPatientListLink(clinicFlowActive, selectedClinicId, query, patient.userid, showTideDashboard);
   const { canUpload, canShare } = getPermissions(patient, permsOfLoggedInUser);
 
   const handleBack = () => {
     trackMetric('Clinic - View patient list', { clinicId: selectedClinicId, source: 'Patient data' });
     history.push(patientListLink);
-  }
+  };
 
   const handleUpload = () => {
     trackMetric('Clicked Navbar Upload Data');
     setIsUploadOverlayOpen(true);
     launchCustomProtocol('tidepoolupload://open');
-  }
+  };
 
   const handleViewData = () => {
+    let viewPath = `/patients/${patient.userid}/data`;
+
+    if (showTideDashboard) viewPath += '?chart=trends';
+
     trackMetric('Clicked Navbar View Data');
-    history.push(`/patients/${patient.userid}/data`);
-  }
+    history.push(viewPath);
+  };
 
   const handleViewProfile = () => {
     trackMetric('Clicked Navbar Name');
     history.push(`/patients/${patient.userid}/profile`);
-  }
+  };
   
   const handleShare = () => {
     trackMetric('Clicked Navbar Share Data');
     history.push(`/patients/${patient.userid}/share`);
-  }
+  };
 
   return (
     <div className="nav-patient-header">
@@ -102,6 +108,6 @@ const NavPatientHeader = ({
       }
     </div>
   );
-}
+};
 
 export default NavPatientHeader;
\ No newline at end of file

From 5884db297c46442a93441ac3aa15578f63d2b196 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 16 Jan 2025 10:00:30 -0800
Subject: [PATCH 33/39] Revert "add chart=trends searchParam when
 showTideDashboard is true"

This reverts commit 0ef24660c7a9c5b1ee57a5f1cfcd340cdf5a9fef.
---
 app/components/navpatientheader/index.js | 34 ++++++++++--------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/components/navpatientheader/index.js b/app/components/navpatientheader/index.js
index 0d4d255588..f2e35a6534 100644
--- a/app/components/navpatientheader/index.js
+++ b/app/components/navpatientheader/index.js
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
-import { useFlags } from 'launchdarkly-react-client-sdk';
+import { useHistory } from 'react-router-dom';
 import { Box, Flex } from 'theme-ui';
 import _ from 'lodash';
 import launchCustomProtocol from 'custom-protocol-detection';
@@ -31,52 +30,47 @@ const HeaderContainer = ({ children }) => (
 );
 
 const NavPatientHeader = ({ 
-  patient,
-  user,
+  patient, 
+  user, 
   permsOfLoggedInUser,
   trackMetric,
-  clinicFlowActive,
-  selectedClinicId,
+  clinicFlowActive, 
+  selectedClinicId, 
+  query, 
 }) => {
   const history = useHistory();
-  const { query } = useLocation();
-  const { showTideDashboard } = useFlags();
   const [isUploadOverlayOpen, setIsUploadOverlayOpen] = useState(false);
 
   if (!patient?.profile) return null;
 
-  const { patientListLink } = getPatientListLink(clinicFlowActive, selectedClinicId, query, patient.userid, showTideDashboard);
+  const { patientListLink } = getPatientListLink(clinicFlowActive, selectedClinicId, query, patient.userid);
   const { canUpload, canShare } = getPermissions(patient, permsOfLoggedInUser);
 
   const handleBack = () => {
     trackMetric('Clinic - View patient list', { clinicId: selectedClinicId, source: 'Patient data' });
     history.push(patientListLink);
-  };
+  }
 
   const handleUpload = () => {
     trackMetric('Clicked Navbar Upload Data');
     setIsUploadOverlayOpen(true);
     launchCustomProtocol('tidepoolupload://open');
-  };
+  }
 
   const handleViewData = () => {
-    let viewPath = `/patients/${patient.userid}/data`;
-
-    if (showTideDashboard) viewPath += '?chart=trends';
-
     trackMetric('Clicked Navbar View Data');
-    history.push(viewPath);
-  };
+    history.push(`/patients/${patient.userid}/data`);
+  }
 
   const handleViewProfile = () => {
     trackMetric('Clicked Navbar Name');
     history.push(`/patients/${patient.userid}/profile`);
-  };
+  }
   
   const handleShare = () => {
     trackMetric('Clicked Navbar Share Data');
     history.push(`/patients/${patient.userid}/share`);
-  };
+  }
 
   return (
     <div className="nav-patient-header">
@@ -108,6 +102,6 @@ const NavPatientHeader = ({
       }
     </div>
   );
-};
+}
 
 export default NavPatientHeader;
\ No newline at end of file

From 547b3d9451a2104f9f9fcf81ffa1dbe542a77c36 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 21 Jan 2025 09:18:59 -0800
Subject: [PATCH 34/39] fix hoursOfCGMData representation

---
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 8316081f7e..7c044cb85d 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -28,9 +28,9 @@ const CGMClipboardButton = ({ patient, pdf }) => {
 
   const { count, sampleFrequency } = pdf?.data?.agpCGM?.data?.current?.stats?.sensorUsage || {};
 
-  const hoursOfCGMData = count * sampleFrequency;
+  const hoursOfCGMData = (count * sampleFrequency) / MS_IN_HOUR;
 
-  const isDataInsufficient = !hoursOfCGMData || ((hoursOfCGMData / MS_IN_HOUR) < 24); // minimum 24 hours
+  const isDataInsufficient = !hoursOfCGMData || hoursOfCGMData < 24;
 
   const handleCopy = () => {
     navigator?.clipboard?.writeText(clipboardText);

From 764eab2d5e190d11fd543ad6fcc5c74fedaae9b0 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 21 Jan 2025 09:43:40 -0800
Subject: [PATCH 35/39] change function signature to decrease data object scope

---
 .../dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js   | 6 +++---
 app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
index 7c044cb85d..9087ea7863 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.js
@@ -11,10 +11,10 @@ const STATE = {
   CLICKED: 'CLICKED',
 };
 
-const CGMClipboardButton = ({ patient, pdf }) => {
+const CGMClipboardButton = ({ patient, data }) => {
   const { t } = useTranslation();
   const [buttonState, setButtonState] = useState(STATE.DEFAULT);
-  const clipboardText = useMemo(() => agpCGMText(patient, pdf), [patient, pdf]);
+  const clipboardText = useMemo(() => agpCGMText(patient, data), [patient, data]);
 
   useEffect(() => {
     let buttonTextEffect = setTimeout(() => {
@@ -26,7 +26,7 @@ const CGMClipboardButton = ({ patient, pdf }) => {
     };
   }, [buttonState]);
 
-  const { count, sampleFrequency } = pdf?.data?.agpCGM?.data?.current?.stats?.sensorUsage || {};
+  const { count, sampleFrequency } = data?.data?.current?.stats?.sensorUsage || {};
 
   const hoursOfCGMData = (count * sampleFrequency) / MS_IN_HOUR;
 
diff --git a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
index bad8d7adbf..05a5883836 100644
--- a/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
+++ b/app/pages/dashboard/PatientDrawer/MenuBar/MenuBar.js
@@ -38,7 +38,7 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
     }, 500);
   };
 
-  const { fullName, birthDate } = patient || {}; 
+  const { fullName, birthDate } = patient || {};
   
   return (
     <Box sx={{ display: 'grid', gridTemplateColumns: '32fr 18fr 18fr 32fr', gap: 3, minHeight: '42px', marginBottom: 3 }}>
@@ -60,7 +60,7 @@ const MenuBar = ({ patientId, api, trackMetric, onClose }) => {
       </Flex>
       
       <Flex sx={{ justifyContent: 'flex-start', alignItems: 'center' }}>
-        <CGMClipboardButton patient={patient} pdf={pdf} />
+        <CGMClipboardButton patient={patient} data={pdf?.data?.agpCGM} />
       </Flex>
 
       <Flex sx={{ fontSize: 0, alignItems: 'center', justifyContent: 'flex-end' }}>

From f4bb2596a1f6d4fc4c893d60d68ce22ba3e4bd05 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 21 Jan 2025 09:53:57 -0800
Subject: [PATCH 36/39] bump viz

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8f9cccf1ea..5a52358dc8 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@storybook/react": "7.5.0",
     "@storybook/react-webpack5": "7.5.0",
     "@testing-library/react-hooks": "8.0.1",
-    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.2",
+    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.3",
     "async": "2.6.4",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",

From ddbb22339e03a56f39601423ec3b62914adb2fee Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 21 Jan 2025 10:03:51 -0800
Subject: [PATCH 37/39] fix test

---
 .../MenuBar/CGMClipboardButton.test.js         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
index 5385b07a07..f9dca3090a 100644
--- a/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
+++ b/test/unit/pages/dashboard/PatientDrawer/MenuBar/CGMClipboardButton.test.js
@@ -48,8 +48,8 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   const writeTextSpy = sinon.stub(window?.navigator?.clipboard, 'writeText');
 
   describe('When data is not present', () => {
-    const insufficientPDF = { data: {} };
-    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
+    const insufficientAgpCGM = null;
+    const wrapper = mount(<CGMClipboardButton patient={patient} data={insufficientAgpCGM} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -57,10 +57,10 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is insufficient due to too few enough readings', () => {
-    const insufficientPDF = _.cloneDeep(pdf);
-    insufficientPDF.data.agpCGM.data.current.stats.sensorUsage.count = 100;
+    const insufficientAgpCGM = _.cloneDeep(pdf.data.agpCGM);
+    insufficientAgpCGM.data.current.stats.sensorUsage.count = 100;
 
-    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} data={insufficientAgpCGM} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -68,8 +68,8 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is insufficient due to being BGM patient', () => {
-    const insufficientPDF = _.cloneDeep(pdf);
-    insufficientPDF.data.agpCGM.data.current.stats = {
+    const insufficientAgpCGM = _.cloneDeep(pdf.data.agpCGM);
+    insufficientAgpCGM.data.current.stats = {
       sensorUsage: { 
         sensorUsage: 0, 
         sensorUsageAGP: 0, 
@@ -79,7 +79,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
       },
     };
 
-    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={insufficientPDF} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} data={insufficientAgpCGM} />);
 
     it('is disabled', () => {
       expect(wrapper.find('button').props().disabled).to.be.true;
@@ -87,7 +87,7 @@ describe('PatientDrawer/MenuBar/CGMClipboardButton', () => {
   });
 
   describe('When data is present', () => {
-    const wrapper = mount(<CGMClipboardButton patient={patient} pdf={pdf} />);
+    const wrapper = mount(<CGMClipboardButton patient={patient} data={pdf.data.agpCGM} />);
     wrapper.find('button').simulate('click');
 
     it('calls writeText on navigator API with correct data', () => {

From 28c0028d4afafe4f76d7c5b82e9e4de14396aed0 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Tue, 21 Jan 2025 10:26:05 -0800
Subject: [PATCH 38/39] bump yarn.lock

---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6f2c7069b..71175f784e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,9 +5278,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.2":
-  version: 1.45.0-web-3346-summary-accuracy.2
-  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.2"
+"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.3":
+  version: 1.45.0-web-3346-summary-accuracy.3
+  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.3"
   dependencies:
     bluebird: 3.7.2
     bows: 1.7.2
@@ -5340,7 +5340,7 @@ __metadata:
     react-dom: 16.x
     react-redux: 8.x
     redux: 4.x
-  checksum: 827386728969d68d4fd68e3c9e56988efc842216201325b455bab0bd5b13b66ec4e78809f89dd1aa5ff6a88e620786d8bc16e65b5c45dbd2404229057f882e2e
+  checksum: 9510f9f7ec4978db89cb60372766403708439459d40351caa73c37365faa3d75a421a62dc3f638614eccf25893e2026fd56d8a6ddd86d88cd23df83dacd8b065
   languageName: node
   linkType: hard
 
@@ -7374,7 +7374,7 @@ __metadata:
     "@storybook/react": 7.5.0
     "@storybook/react-webpack5": 7.5.0
     "@testing-library/react-hooks": 8.0.1
-    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.2
+    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.3
     async: 2.6.4
     autoprefixer: 10.4.16
     babel-core: 7.0.0-bridge.0

From 3359557548ae6f989a7a7834d84be8425e82a9f3 Mon Sep 17 00:00:00 2001
From: Henry Liang <henry.liang@tidepool.org>
Date: Thu, 23 Jan 2025 13:49:35 -0800
Subject: [PATCH 39/39] bump viz

---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 5a52358dc8..b242ec78c5 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@storybook/react": "7.5.0",
     "@storybook/react-webpack5": "7.5.0",
     "@testing-library/react-hooks": "8.0.1",
-    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.3",
+    "@tidepool/viz": "1.45.0-web-3346-summary-accuracy.4",
     "async": "2.6.4",
     "autoprefixer": "10.4.16",
     "babel-core": "7.0.0-bridge.0",
diff --git a/yarn.lock b/yarn.lock
index 71175f784e..b056450907 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,9 +5278,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.3":
-  version: 1.45.0-web-3346-summary-accuracy.3
-  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.3"
+"@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.4":
+  version: 1.45.0-web-3346-summary-accuracy.4
+  resolution: "@tidepool/viz@npm:1.45.0-web-3346-summary-accuracy.4"
   dependencies:
     bluebird: 3.7.2
     bows: 1.7.2
@@ -5340,7 +5340,7 @@ __metadata:
     react-dom: 16.x
     react-redux: 8.x
     redux: 4.x
-  checksum: 9510f9f7ec4978db89cb60372766403708439459d40351caa73c37365faa3d75a421a62dc3f638614eccf25893e2026fd56d8a6ddd86d88cd23df83dacd8b065
+  checksum: 18467d1d827507db3e579ab49f069ca6e26a3a2a81a5f4d6e95352aa397e17b8b112ea0c7df3d4043fc71df6eba17464bbcb44a3c257864a2334f27ff94713b9
   languageName: node
   linkType: hard
 
@@ -7374,7 +7374,7 @@ __metadata:
     "@storybook/react": 7.5.0
     "@storybook/react-webpack5": 7.5.0
     "@testing-library/react-hooks": 8.0.1
-    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.3
+    "@tidepool/viz": 1.45.0-web-3346-summary-accuracy.4
     async: 2.6.4
     autoprefixer: 10.4.16
     babel-core: 7.0.0-bridge.0