haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(rn,conference) hide timer until it has started 

It may never start if the component is not deployed.
This commit is contained in:
Saúl Ibarra Corretgé 2021-12-02 14:00:50 +01:00 committed by Saúl Ibarra Corretgé
parent 3cbddb9d6a
commit 322ec107cd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
react/features/conference/components/native/NavigationBar.js
View File

@ -3,7 +3,7 @@
import React from 'react'; import React from 'react';
import { Text, View } from 'react-native'; import { Text, View } from 'react-native';
import { getConferenceName } from '../../../base/conference'; import { getConferenceName, getConferenceTimestamp } from '../../../base/conference/functions';
import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags'; import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags';
import { connect } from '../../../base/redux'; import { connect } from '../../../base/redux';
import InviteButton from '../../../invite/components/add-people-dialog/native/InviteButton'; import InviteButton from '../../../invite/components/add-people-dialog/native/InviteButton';
@ -93,10 +93,11 @@ const NavigationBar = (props: Props) => {
*/ */
function _mapStateToProps(state) { function _mapStateToProps(state) {
const { hideConferenceTimer, hideConferenceSubject } = state['features/base/config']; const { hideConferenceTimer, hideConferenceSubject } = state['features/base/config'];
const startTimestamp = getConferenceTimestamp(state);
return { return {
_conferenceTimerEnabled: _conferenceTimerEnabled:
getFeatureFlag(state, CONFERENCE_TIMER_ENABLED, true) && !hideConferenceTimer, getFeatureFlag(state, CONFERENCE_TIMER_ENABLED, true) && !hideConferenceTimer && startTimestamp,
_meetingName: getConferenceName(state), _meetingName: getConferenceName(state),
_meetingNameEnabled: _meetingNameEnabled:
getFeatureFlag(state, MEETING_NAME_ENABLED, true) && !hideConferenceSubject, getFeatureFlag(state, MEETING_NAME_ENABLED, true) && !hideConferenceSubject,