talksik/flutter-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into firebase

Browse Source 
# Conflicts:
#	packages/stream_chat_v1/pubspec.yaml
This commit is contained in:
xsahil03x
2023-06-22 00:15:57 +05:30
parent e0a6b8700c 20723a39f7
commit 3772925451
14 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_v1/lib/app.dart
+3 -3
View File
@@ -289,8 +289,8 @@ class _StreamChatSampleAppState extends State<StreamChatSampleApp>
redirect: (context, state) {
final loggedIn =
_initNotifier.initData?.client.state.currentUser != null;
final loggingIn = state.subloc == Routes.CHOOSE_USER.path ||
state.subloc == Routes.ADVANCED_OPTIONS.path;
final loggingIn = state.matchedLocation == Routes.CHOOSE_USER.path ||
state.matchedLocation == Routes.ADVANCED_OPTIONS.path;
if (!loggedIn) {
return loggingIn ? null : Routes.CHOOSE_USER.path;
@@ -298,7 +298,7 @@ class _StreamChatSampleAppState extends State<StreamChatSampleApp>
// if the user is logged in but still on the login page, send them to
// the home page
if (loggedIn && state.subloc == Routes.CHOOSE_USER.path) {
if (loggedIn && state.matchedLocation == Routes.CHOOSE_USER.path) {
return Routes.CHANNEL_LIST_PAGE.path;
}