[IMPROVE] Remove too specific helpers isFirefox() and isChrome() (#14963

)

app/ui/client/components/icon.js

@@ -1,10 +1,23 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 
-import { isChrome, isFirefox } from '../../../utils';
+import './icon.html';
+
 
 const baseUrlFix = () => `${ document.baseURI }${ FlowRouter.current().path.substring(1) }`;
 
+const isMozillaFirefoxBelowVersion = (upperVersion) => {
+	const [, version] = navigator.userAgent.match(/Firefox\/(\d+)\.\d/) || [];
+	return parseInt(version, 10) < upperVersion;
+};
+
+const isGoogleChromeBelowVersion = (upperVersion) => {
+	const [, version] = navigator.userAgent.match(/Chrome\/(\d+)\.\d/) || [];
+	return parseInt(version, 10) < upperVersion;
+};
+
+const isBaseUrlFixNeeded = () => isMozillaFirefoxBelowVersion(55) || isGoogleChromeBelowVersion(55);
+
 Template.icon.helpers({
-	baseUrl: (isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55) ? baseUrlFix : undefined,
+	baseUrl: isBaseUrlFixNeeded() ? baseUrlFix : undefined,
 });

app/ui/client/index.js

@@ -44,7 +44,6 @@ import './views/app/secretURL';
 import './views/app/videoCall/videoButtons';
 import './views/app/videoCall/videoCall';
 import './views/app/photoswipe';
-import './components/icon.html';
 import './components/icon';
 import './components/table.html';
 import './components/table';

app/utils/client/index.js

@@ -1,5 +1,4 @@
 export { t, isRtl } from '../lib/tapi18n';
-export { isChrome, isFirefox } from './lib/browsers';
 export { getDefaultSubscriptionPref } from '../lib/getDefaultSubscriptionPref';
 export { Info } from '../rocketchat.info';
 export { isEmail } from '../lib/isEmail';