diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0107733e3b2e71a1ebc543dbf21eafafea7db9a8..ffbf33c12d2893bdddd89e3ba87c13f44982bf1c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -149,7 +149,6 @@
"timestep",
"TIMESTEP",
"timesteps",
- "UNCOMING",
"Unstarted",
"UNSTARTED",
"usageevent",
diff --git a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
index c81e97ba95ea3b07a785396678f5e3460c2ca20b..91030a58f917c22d05e9efbdecb62d6fb6013d9d 100644
--- a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
+++ b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
@@ -318,7 +318,7 @@ exports[`MaxConsumptionCard component should be rendered correctly 1`] = `
</lineargradient>
</defs>
<path
- class="bar-ELECTRICITY bar-UNCOMING disabled bounce-3 delay--2"
+ class="bar-ELECTRICITY bar-UPCOMING disabled bounce-3 delay--2"
d="
M0,4
a4,4 0 0 1 4,-4
diff --git a/src/components/Charts/Bar.tsx b/src/components/Charts/Bar.tsx
index c8cdd159dda614466af49e8f7ebbb498f18fd064..0b6ccdb99804c32a1349444c92be2729f083d9c7 100644
--- a/src/components/Charts/Bar.tsx
+++ b/src/components/Charts/Bar.tsx
@@ -129,7 +129,7 @@ const Bar = ({
const selected = isSelectedDate ? 'selected' : ''
const getBarClass = () => {
- const upcoming = dataload.value === -1 ? 'bar-UNCOMING' : ''
+ const upcoming = dataload.value === -1 ? 'bar-UPCOMING' : ''
const edgeBrowser = browser && browser.name !== 'edge'
const bounce = edgeBrowser ? '1' : '3'
diff --git a/src/components/Charts/UncomingBar.spec.tsx b/src/components/Charts/UpcomingBar.spec.tsx
similarity index 84%
rename from src/components/Charts/UncomingBar.spec.tsx
rename to src/components/Charts/UpcomingBar.spec.tsx
index 30f5cb0cc48a9a054940be9528373826093c53b8..a84b0d4f20bdd91c54daa565fea05780efe85ea1 100644
--- a/src/components/Charts/UncomingBar.spec.tsx
+++ b/src/components/Charts/UpcomingBar.spec.tsx
@@ -3,13 +3,13 @@ import { scaleLinear } from 'd3'
import React from 'react'
import { dataLoadArray } from 'tests/__mocks__/chartData.mock'
import { mockXScale } from 'tests/__mocks__/xScale.mock'
-import UncomingBar from './UncomingBar'
+import UpcomingBar from './UpcomingBar'
-describe('Uncoming component', () => {
+describe('Upcoming component', () => {
it('should match snapshot', () => {
const { container } = render(
<svg>
- <UncomingBar
+ <UpcomingBar
index={0}
average={10}
dataload={dataLoadArray[0]}
diff --git a/src/components/Charts/UncomingBar.tsx b/src/components/Charts/UpcomingBar.tsx
similarity index 95%
rename from src/components/Charts/UncomingBar.tsx
rename to src/components/Charts/UpcomingBar.tsx
index 32dcb3c1544e50f9764f8ac90f9ed4632136451e..7022e3766230b8739f343894cd018bcc4413ff04 100644
--- a/src/components/Charts/UncomingBar.tsx
+++ b/src/components/Charts/UpcomingBar.tsx
@@ -13,7 +13,7 @@ interface BarProps {
average: number
}
-const UncomingBar = ({
+const UpcomingBar = ({
index,
dataload,
xScale,
@@ -32,7 +32,7 @@ const UncomingBar = ({
animationClass = browser?.name !== 'edge' ? 'bounce-1' : 'bounce-3'
animationClass += ` delay--${index % 13}`
}
- const barClass = `bar-UNCOMING ${animationClass}`
+ const barClass = `bar-UPCOMING ${animationClass}`
const topRoundedRectDashedLine = (
x: number,
@@ -114,4 +114,4 @@ const UncomingBar = ({
)
}
-export default UncomingBar
+export default UpcomingBar
diff --git a/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap b/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
index f7ffac763245b3d4f9ce24a9a7ead187a69d44e2..9df650b27b60a6bfb1e770e9d86a1a0f94c6e7a2 100644
--- a/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
+++ b/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
@@ -293,7 +293,7 @@ exports[`BarChart component should render correctly 1`] = `
</lineargradient>
</defs>
<path
- class="bar-ELECTRICITY bar-UNCOMING selected bounce-2 delay"
+ class="bar-ELECTRICITY bar-UPCOMING selected bounce-2 delay"
d="
M0,4
a4,4 0 0 1 4,-4
diff --git a/src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap b/src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
similarity index 84%
rename from src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap
rename to src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
index 0b62bbcd9d26f68c31cfcd922a16a6c611442d1d..c54a776a9e4502dc173f0c5946ab2e07c3f5fac1 100644
--- a/src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap
+++ b/src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`Uncoming component should match snapshot 1`] = `
+exports[`Upcoming component should match snapshot 1`] = `
<div>
<svg>
<g>
@@ -20,7 +20,7 @@ exports[`Uncoming component should match snapshot 1`] = `
transform="translate(undefined, 10)"
>
<path
- class="bar-UNCOMING bounce-1 delay--0"
+ class="bar-UPCOMING bounce-1 delay--0"
d="M0,40v-36 a4,4 0 0 1 4,-4h-5.5a4,4 0 0 1 4,4v36"
fill="url(#gradient)"
stroke="#61f0f2"
diff --git a/src/components/Duel/DuelChart/DuelBar.tsx b/src/components/Duel/DuelChart/DuelBar.tsx
index a23d20f574bc89df850b1a9ed20f4cdca8e53a2b..d90ebddcefa7d14d1763717c7768601a6f7bb6e9 100644
--- a/src/components/Duel/DuelChart/DuelBar.tsx
+++ b/src/components/Duel/DuelChart/DuelBar.tsx
@@ -1,7 +1,7 @@
import AxisBottom from 'components/Charts/AxisBottom'
import AxisRight from 'components/Charts/AxisRight'
import Bar from 'components/Charts/Bar'
-import UncomingBar from 'components/Charts/UncomingBar'
+import UpcomingBar from 'components/Charts/UpcomingBar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
@@ -116,7 +116,7 @@ const DuelBar = ({
)
} else {
return (
- <UncomingBar
+ <UpcomingBar
key={d.date.toISO()}
index={index}
dataload={d}
diff --git a/src/styles/components/_barchart.scss b/src/styles/components/_barchart.scss
index 209e00d3bfa361fa0a0decfb44d9acf7a072bcb3..16fdf31cd70c22b952979b857ebfb9a3cb0b342d 100644
--- a/src/styles/components/_barchart.scss
+++ b/src/styles/components/_barchart.scss
@@ -127,7 +127,7 @@
}
}
}
-.bar-UNCOMING {
+.bar-UPCOMING {
fill: $grey-dark;
opacity: 0.6;
&.selected {