Skip to content

Some fixes #500

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.

Sign up for GitHub

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

Open
dewabisma wants to merge 2 commits into
base: beast/add-infinite-scroll-and-pull-to-refresh
Choose a base branch
from
+13 −12
Open

Some fixes #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c74e39
fix: prevent from creating account name using whitespace only
dewabisma May 25, 2026
17b6d65
feat: remove redeem button
dewabisma May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions mobile-app/lib/v2/screens/accounts/create_account_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
List<Account> _accounts = [];
int _walletIndex = 0;
bool _isLoading = false;
String? _error;

bool get _isDisabled => _accountName.text.isEmpty || _isLoading || _error != null;
bool get _isDisabled => _accountName.text.trim().isEmpty || _isLoading;

int _walletIndexForActiveAccount(List<Account> accounts, DisplayAccount? activeDisplayAccount) {
if (activeDisplayAccount is RegularAccount) {
Expand Down Expand Up @@ -126,7 +125,7 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {

return ScaffoldBase(
appBar: V2AppBar(title: l10n.createAccountAppBarTitle),
mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle, error: _error),
mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle),
bottomContent: ScaffoldBaseBottomContent(
child: QuantusButton.simple(
label: l10n.createAccountButton,
Expand Down
3 changes: 3 additions & 0 deletions mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
final _accountsService = AccountsService();
bool _saving = false;

bool get _isDisabled => _controller.text.trim().isEmpty;

@override
void initState() {
super.initState();
Expand Down Expand Up @@ -82,6 +84,7 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
label: l10n.editAccountDone,
onTap: _save,
isLoading: _saving,
isDisabled: _isDisabled,
),
),
);
Expand Down
17 changes: 8 additions & 9 deletions mobile-app/lib/v2/screens/settings/mining_rewards_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import 'package:resonance_network_wallet/providers/mining_rewards_provider.dart'
import 'package:resonance_network_wallet/providers/wallet_providers.dart';
import 'package:resonance_network_wallet/services/mining_rewards_service.dart';
import 'package:resonance_network_wallet/shared/utils/open_external_url.dart';
import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
import 'package:resonance_network_wallet/v2/components/split_card.dart';
import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
Expand All @@ -37,13 +35,14 @@ class MiningRewardsScreen extends ConsumerWidget {
_ErrorState(colors: colors, text: text, l10n: l10n, onRetry: () => ref.invalidate(miningRewardsProvider)),
),
],
bottomContent: miningAsync.when(
data: (data) => data.totalBlocks > 0
? ScaffoldBaseBottomContent(child: QuantusButton.simple(label: l10n.settingsMiningRedeem, onTap: null))
: null,
loading: () => null,
error: (err, _) => null,
),
// TODO: Enable redeem button when it is implemented
// bottomContent: miningAsync.when(
// data: (data) => data.totalBlocks > 0
// ? ScaffoldBaseBottomContent(child: QuantusButton.simple(label: l10n.settingsMiningRedeem, onTap: null))
// : null,
// loading: () => null,
// error: (err, _) => null,
// ),
);
}
}
Expand Down