ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made button same height when loading, added timeout to language settings / avatar page (#1275)

Browse source
This commit is contained in:
ggurdin 2024-12-18 16:27:52 -05:00 • committed by GitHub
parent 341f44090d
commit 940b65d007
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pangea/pages/sign_up/full_width_button.dart
View file

@ -62,7 +62,13 @@ class FullWidthButtonState extends State<FullWidthButton> {
mainAxisAlignment: MainAxisAlignment.center,
children: [
widget.loading
? const Expanded(child: LinearProgressIndicator())
? const Expanded(
child: SizedBox(
height: 18,
child:
Center(child: LinearProgressIndicator()),
),
)
: widget.title,
],
),

9
lib/pangea/pages/sign_up/user_settings.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:fluffychat/pangea/controllers/language_list_controller.dart';
import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
import 'package:fluffychat/pangea/models/language_model.dart';
@ -145,7 +147,12 @@ class UserSettingsState extends State<UserSettingsPage> {
waitForDataInSync: true,
),
];
await Future.wait(updateFuture);
await Future.wait(updateFuture).timeout(
const Duration(seconds: 30),
onTimeout: () {
throw TimeoutException(L10n.of(context).oopsSomethingWentWrong);
},
);
context.go('/rooms');
} catch (err) {
if (err is MatrixException) {