-
Notifications
You must be signed in to change notification settings - Fork 6.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(authentication/native): hide login button for 8x8.vc #13881
feat(authentication/native): hide login button for 8x8.vc #13881
Conversation
Why do we need to hide this only on native? If there is no other option, we should probably add a config and not hardcode domains, wdyt? |
@@ -97,9 +106,11 @@ class WaitForOwnerDialog extends Component<IProps> { | |||
*/ | |||
function mapStateToProps(state: IReduxState) { | |||
const { membersOnly, lobbyWaitingForHost } = state['features/base/conference']; | |||
const serverURL = getDefaultURL(state); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't want the default one, we need to check the current one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was a bit confused because getDefaultURL returns getServerURL that returns the current one. Will update.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but you can join a meeting in a server which is neither the default nor the configured one. We need to extract it from the current location URL.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated.
@@ -106,11 +107,12 @@ class WaitForOwnerDialog extends Component<IProps> { | |||
*/ | |||
function mapStateToProps(state: IReduxState) { | |||
const { membersOnly, lobbyWaitingForHost } = state['features/base/conference']; | |||
const serverURL = getServerURL(state); | |||
const { conference } = getConferenceState(state); | |||
const locationURL = conference?.getConnection()[JITSI_CONNECTION_URL_KEY]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't you take it from sthe state? We store it in base/connection. Also, it's a URL, so you should compare the hostname part.
f0caf8e
to
6f5b2b0
Compare
/** | ||
* Location where the current meeting takes place. | ||
*/ | ||
_hostname?: string; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pl make this _confirmHidden and comput it in mapStateToProps instead.
No description provided.