|
@@ -137,25 +137,24 @@ export function appNavigate(uri?: string, options: IReloadNowOptions = {}) {
|
137
|
137
|
dispatch(setConfig(config));
|
138
|
138
|
dispatch(setRoom(room));
|
139
|
139
|
|
140
|
|
- if (room) {
|
141
|
|
- if (isUnsafeRoomWarningEnabled(getState()) && isInsecureRoomName(room)) {
|
142
|
|
- navigateRoot(screen.unsafeRoomWarning);
|
|
140
|
+ if (!room) {
|
|
141
|
+ goBackToRoot(getState(), dispatch);
|
143
|
142
|
|
144
|
|
- return;
|
145
|
|
- }
|
146
|
|
- dispatch(createDesiredLocalTracks());
|
147
|
|
- dispatch(clearNotifications());
|
|
143
|
+ return;
|
|
144
|
+ }
|
148
|
145
|
|
149
|
|
- const { hidePrejoin } = options;
|
|
146
|
+ dispatch(createDesiredLocalTracks());
|
|
147
|
+ dispatch(clearNotifications());
|
150
|
148
|
|
151
|
|
- if (!hidePrejoin && isPrejoinPageEnabled(getState())) {
|
152
|
|
- navigateRoot(screen.preJoin);
|
|
149
|
+ if (!options.hidePrejoin && isPrejoinPageEnabled(getState())) {
|
|
150
|
+ if (isUnsafeRoomWarningEnabled(getState()) && isInsecureRoomName(room)) {
|
|
151
|
+ navigateRoot(screen.unsafeRoomWarning);
|
153
|
152
|
} else {
|
154
|
|
- dispatch(connect());
|
155
|
|
- navigateRoot(screen.conference.root);
|
|
153
|
+ navigateRoot(screen.preJoin);
|
156
|
154
|
}
|
157
|
155
|
} else {
|
158
|
|
- goBackToRoot(getState(), dispatch);
|
|
156
|
+ dispatch(connect());
|
|
157
|
+ navigateRoot(screen.conference.root);
|
159
|
158
|
}
|
160
|
159
|
};
|
161
|
160
|
}
|