|
|
@@ -8,7 +8,7 @@ import {
|
|
8
|
8
|
import { connect } from 'react-redux';
|
|
9
|
9
|
|
|
10
|
10
|
import { appNavigate } from '../../app';
|
|
11
|
|
-import { getURLWithoutParams } from '../../base/connection';
|
|
|
11
|
+import { getURLWithoutParamsNormalized } from '../../base/connection';
|
|
12
|
12
|
import { getLocalizedDateFormatter, translate } from '../../base/i18n';
|
|
13
|
13
|
import { Icon } from '../../base/font-icons';
|
|
14
|
14
|
import { ASPECT_RATIO_NARROW } from '../../base/responsive-ui';
|
|
|
@@ -223,7 +223,11 @@ class ConferenceNotification extends Component<Props, State> {
|
|
223
|
223
|
const now = Date.now();
|
|
224
|
224
|
|
|
225
|
225
|
for (const event of _eventList) {
|
|
226
|
|
- if (event.url !== _currentConferenceURL) {
|
|
|
226
|
+ const eventUrl = getURLWithoutParamsNormalized(
|
|
|
227
|
+ new URL(event.url)
|
|
|
228
|
+ );
|
|
|
229
|
+
|
|
|
230
|
+ if (eventUrl !== _currentConferenceURL) {
|
|
227
|
231
|
if ((!eventToShow
|
|
228
|
232
|
&& event.startDate > now
|
|
229
|
233
|
&& event.startDate < now + ALERT_MILLISECONDS)
|
|
|
@@ -275,7 +279,8 @@ export function _mapStateToProps(state: Object) {
|
|
275
|
279
|
return {
|
|
276
|
280
|
_aspectRatio: state['features/base/responsive-ui'].aspectRatio,
|
|
277
|
281
|
_currentConferenceURL:
|
|
278
|
|
- locationURL ? getURLWithoutParams(locationURL)._url : '',
|
|
|
282
|
+ locationURL
|
|
|
283
|
+ ? getURLWithoutParamsNormalized(locationURL) : '',
|
|
279
|
284
|
_eventList: state['features/calendar-sync'].events
|
|
280
|
285
|
};
|
|
281
|
286
|
}
|