-
- {props.secondaryTitle && (
- <>
-
- {props.title}
-
-
-
- )}
- {props.secondaryTitle || props.title}
-
-
- {props.visibilityToggle && }
- {props.report !== false && }
- {props.children}
-
+
+
+ {props.secondaryTitle && (
+ <>
+
+ {props.title}
+
+
+
+ )}
+ {props.secondaryTitle || props.title}
+
+
+ {props.visibilityToggle && }
+ {props.report !== false && }
+ {props.children}
-
+
);
}
diff --git a/src/features/greeting/options/GreetingOptions.jsx b/src/features/greeting/options/GreetingOptions.jsx
index a76a9726..5d6ed641 100644
--- a/src/features/greeting/options/GreetingOptions.jsx
+++ b/src/features/greeting/options/GreetingOptions.jsx
@@ -273,7 +273,7 @@ const GreetingOptions = () => {
{CustomEventsSection()}
) : (
-
+
-
+
diff --git a/src/features/misc/sections/Experimental.jsx b/src/features/misc/sections/Experimental.jsx
index 37876a00..d962930f 100644
--- a/src/features/misc/sections/Experimental.jsx
+++ b/src/features/misc/sections/Experimental.jsx
@@ -37,7 +37,7 @@ function ExperimentalOptions() {
marks={values.experimental}
element=".other"
/>
- Send Event
+ Send Event
EventBus.emit(eventType, eventName)}
- label="send"
+ label="Send"
/>
diff --git a/src/features/misc/sections/overview_skeletons/Clock.jsx b/src/features/misc/sections/overview_skeletons/Clock.jsx
index 730a2ebb..8f0700e2 100644
--- a/src/features/misc/sections/overview_skeletons/Clock.jsx
+++ b/src/features/misc/sections/overview_skeletons/Clock.jsx
@@ -15,16 +15,16 @@ function ClockSkeleton() {
);
} else if (localStorage.getItem('timeType') === 'percentageComplete') {
- return 68%;
+ return 68%;
} else if (localStorage.getItem('timeType') === 'verticalClock') {
return (
-
+
10
23
);
} else {
- return 10:24;
+ return 10:24;
}
}
diff --git a/src/features/quicklinks/options/QuickLinksOptions.jsx b/src/features/quicklinks/options/QuickLinksOptions.jsx
index 3caa44c6..17dc891f 100644
--- a/src/features/quicklinks/options/QuickLinksOptions.jsx
+++ b/src/features/quicklinks/options/QuickLinksOptions.jsx
@@ -210,6 +210,7 @@ class QuickLinksOptions extends PureComponent {
/>
diff --git a/src/features/quote/options/QuoteOptions.jsx b/src/features/quote/options/QuoteOptions.jsx
index eebe8b02..02d2c1a6 100644
--- a/src/features/quote/options/QuoteOptions.jsx
+++ b/src/features/quote/options/QuoteOptions.jsx
@@ -277,7 +277,12 @@ class QuoteOptions extends PureComponent {
)}
{!this.state.sourceSection && (
-
+
}
title={variables.getMessage('modals.main.settings.sections.background.source.title')}
diff --git a/src/features/stats/options/StatsOptions.jsx b/src/features/stats/options/StatsOptions.jsx
index 8e5906ed..694e4fec 100644
--- a/src/features/stats/options/StatsOptions.jsx
+++ b/src/features/stats/options/StatsOptions.jsx
@@ -73,16 +73,17 @@ class Stats extends PureComponent {
render() {
const achievementElement = (key, id, achieved, timestamp) => {
const { name, description } = getLocalisedAchievementData(id);
- console.log(timestamp);
return (
{achieved ?
:
}
{achieved ? (
-
- {new Date(timestamp).toLocaleDateString()}
-
+ timestamp !== undefined ? (
+
+ {new Date(timestamp).toLocaleDateString()}
+
+ ) : null
) : null}
{name}
{achieved ? description : '?????'}
@@ -165,7 +166,7 @@ class Stats extends PureComponent {
)}
{statsElement(
variables.getMessage(`${STATS_SECTION}.sections.addons_installed`),
- this.state.stats.marketplace ? this.state.stats.marketplace['install'] : 0,
+ this.state.stats.marketplace['install'] ? this.state.stats.marketplace['install'].length : 0,
)}
{finalHour}
diff --git a/src/features/time/options/DateOptions.jsx b/src/features/time/options/DateOptions.jsx
index 3e8e32c5..e185fe53 100644
--- a/src/features/time/options/DateOptions.jsx
+++ b/src/features/time/options/DateOptions.jsx
@@ -88,7 +88,7 @@ function DateOptions() {
zoomSetting="zoomDate"
visibilityToggle={true}
/>
-
+
{
zoomSetting="zoomClock"
visibilityToggle={true}
/>
-
+
{getTimeSettings()}
diff --git a/src/features/weather/Weather.jsx b/src/features/weather/Weather.jsx
index 68e168bc..4417bea5 100644
--- a/src/features/weather/Weather.jsx
+++ b/src/features/weather/Weather.jsx
@@ -21,15 +21,20 @@ class WeatherWidget extends PureComponent {
async componentDidMount() {
EventBus.on('refresh', async (data) => {
- // Convert the callback function to an async function
if (data === 'weather') {
const weatherData = await getWeather(this.state.location, this.state.done);
this.setState(weatherData);
+
+ const zoomWeather = `${Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`;
+ document.querySelector('.weather').style.fontSize = zoomWeather;
}
});
const weatherData = await getWeather(this.state.location, this.state.done);
this.setState(weatherData);
+
+ const zoomWeather = `${Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`;
+ document.querySelector('.weather').style.fontSize = zoomWeather;
}
componentWillUnmount() {
diff --git a/src/features/weather/api/getWeather.js b/src/features/weather/api/getWeather.js
index 14048cc6..aa953edd 100644
--- a/src/features/weather/api/getWeather.js
+++ b/src/features/weather/api/getWeather.js
@@ -14,9 +14,6 @@ export const getWeather = async (location, done) => {
return;
}
- const zoomWeather = `${Number((localStorage.getItem('zoomWeather') || 100) / 100)}em`;
- document.querySelector('.weather').style.fontSize = zoomWeather;
-
try {
const response = await fetch(
variables.constants.API_URL + `/weather?city=${location}&language=${variables.languagecode}`,
@@ -65,6 +62,4 @@ export const getWeather = async (location, done) => {
} catch (error) {
console.error('Fetch Error: ', error);
}
-
- document.querySelector('.top-weather svg').style.fontSize = zoomWeather;
};
diff --git a/src/features/weather/options/WeatherOptions.jsx b/src/features/weather/options/WeatherOptions.jsx
index e85041e5..e73b0e8f 100644
--- a/src/features/weather/options/WeatherOptions.jsx
+++ b/src/features/weather/options/WeatherOptions.jsx
@@ -35,7 +35,6 @@ class WeatherOptions extends PureComponent {
render() {
const weatherType = localStorage.getItem('weatherType');
-
const WEATHER_SECTION = 'modals.main.settings.sections.weather';
const WidgetType = () => {
diff --git a/src/features/welcome/components/Sections/Final.jsx b/src/features/welcome/components/Sections/Final.jsx
index 45ffd490..bf917ee9 100644
--- a/src/features/welcome/components/Sections/Final.jsx
+++ b/src/features/welcome/components/Sections/Final.jsx
@@ -29,11 +29,10 @@ function Final(props) {
props.switchTab(3)}>
+
props.switchTab(2)}>
{variables.getMessage('modals.welcome.sections.final.imported', {
amount: props.importedSettings.length,
})}{' '}
- {props.importedSettings.length}
)}