Merge pull request Hubs-Foundation#6189 from mozilla/fix-legacy-namet…

…ag-color-customisation Fix legacy nametag color customisation
kira924age · Jul 27, 2023 · 2a325e3 · 2a325e3
2 parents 7c2ec8d + 3e9cf6d
commit 2a325e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/admin/src/react-components/service-editor.js b/admin/src/react-components/service-editor.js
@@ -459,6 +459,7 @@ class ConfigurationEditor extends Component {
               className={this.props.classes.button}
               variant="contained"
               color="primary"
+              disabled={this.state.warningMessage}
             >
               Save
             </Button>

diff --git a/src/utils/theme.js b/src/utils/theme.js
@@ -105,7 +105,8 @@ function getCurrentTheme() {
 
 function getThemeColor(name) {
   const theme = getCurrentTheme();
-  return theme?.variables?.[name] || DEFAULT_COLORS[name];
+  // config?.theme?.[name] ensures legacy variables for nametag colors are taken into account
+  return theme?.variables?.[name] || config?.theme?.[name] || DEFAULT_COLORS[name];
 }
 
 function updateTextButtonColors() {