diff --git a/package.json b/package.json
index 1a78e3155..8815840c1 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
- "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#e398d08e696356908725c8f51f32c30e7cb002ec",
+ "@dhis2/analytics": "^26.9.4",
"@dhis2/app-runtime": "^3.10.6",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/d2-i18n": "^1.1.3",
diff --git a/src/components/DashboardsBar/InformationBlock/ActionsBar.js b/src/components/DashboardsBar/InformationBlock/ActionsBar.js
index 8add1296b..b01f0ba07 100644
--- a/src/components/DashboardsBar/InformationBlock/ActionsBar.js
+++ b/src/components/DashboardsBar/InformationBlock/ActionsBar.js
@@ -186,11 +186,16 @@ const ActionsBar = ({
return
}
- const slideshowTooltipContent = !hasSlideshowItems
- ? i18n.t('No dashboard items to show in slideshow')
- : offline && !isCached
- ? i18n.t('Not available offline')
- : null
+ const getSlideshowTooltipContent = () => {
+ if (!hasSlideshowItems) {
+ return i18n.t('No dashboard items to show in slideshow')
+ } else if (offline && !isCached) {
+ return i18n.t('Not available offline')
+ }
+ return null
+ }
+
+ const slideshowTooltipContent = getSlideshowTooltipContent()
return (
<>
diff --git a/src/components/DashboardsBar/InformationBlock/__tests__/FilterSelector.spec.js b/src/components/DashboardsBar/InformationBlock/__tests__/FilterSelector.spec.js
index 108da2d4e..28d6c81a1 100644
--- a/src/components/DashboardsBar/InformationBlock/__tests__/FilterSelector.spec.js
+++ b/src/components/DashboardsBar/InformationBlock/__tests__/FilterSelector.spec.js
@@ -15,7 +15,7 @@ useDimensions.mockImplementation(() => ['Moomin', 'Snorkmaiden'])
const baseState = { activeModalDimension: {}, itemFilters: {} }
const createMockStore = (state) =>
- createStore(() => Object.assign({}, baseState, state))
+ createStore(() => ({ ...baseState, ...state }))
test('is disabled when offline', () => {
useDhis2ConnectionStatus.mockImplementationOnce(
diff --git a/src/components/DashboardsBar/InformationBlock/styles/InformationBlock.module.css b/src/components/DashboardsBar/InformationBlock/styles/InformationBlock.module.css
index 4db96ab27..176b097fb 100644
--- a/src/components/DashboardsBar/InformationBlock/styles/InformationBlock.module.css
+++ b/src/components/DashboardsBar/InformationBlock/styles/InformationBlock.module.css
@@ -16,7 +16,6 @@
}
.title {
- font-family: 'Roboto';
font-size: 16px;
line-height: 16px;
font-weight: 500;
diff --git a/src/components/DashboardsBar/NavigationMenu/NavigationMenu.js b/src/components/DashboardsBar/NavigationMenu/NavigationMenu.js
index 125a82e5a..dd87cf11a 100644
--- a/src/components/DashboardsBar/NavigationMenu/NavigationMenu.js
+++ b/src/components/DashboardsBar/NavigationMenu/NavigationMenu.js
@@ -69,7 +69,7 @@ export const NavigationMenu = ({ close }) => {