Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make RelinkDialog supersede the NetworkDialog

Browse Source
This commit is contained in:
Josh Perez
2020-04-27 18:36:49 -04:00
committed by Scott Nonnenberg
parent 1b5c36a9a8
commit 752cd75c54
5 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/state/selectors/network.ts
View File

@@ -13,9 +13,9 @@ export const hasNetworkDialog = createSelector(
{ isOnline, socketStatus, withinConnectingGracePeriod }: NetworkStateType,
isRegistrationDone: boolean
): boolean =>
!isOnline ||
!isRegistrationDone ||
(socketStatus === WebSocket.CONNECTING && !withinConnectingGracePeriod) ||
socketStatus === WebSocket.CLOSED ||
socketStatus === WebSocket.CLOSING
isRegistrationDone &&
(!isOnline ||
(socketStatus === WebSocket.CONNECTING && !withinConnectingGracePeriod) ||
socketStatus === WebSocket.CLOSED ||
socketStatus === WebSocket.CLOSING)
);

2
ts/state/smart/RelinkDialog.tsx
View File

@@ -3,12 +3,10 @@ import { mapDispatchToProps } from '../actions';
import { RelinkDialog } from '../../components/RelinkDialog';
import { StateType } from '../reducer';
import { getIntl } from '../selectors/user';
import { hasNetworkDialog } from '../selectors/network';
import { isDone } from '../../util/registration';
const mapStateToProps = (state: StateType) => {
return {
hasNetworkDialog: hasNetworkDialog(state),
i18n: getIntl(state),
isRegistrationDone: isDone(),
};