Skip to content
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

support system.remark on account manage page #1698

Merged
merged 11 commits into from
Sep 18, 2024
Merged

support system.remark on account manage page #1698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d7e5e27
support system.remark on account manage page
brenzi Sep 12, 2024
d9e6335
minor mod
brenzi Sep 13, 2024
d7446ec
fix review comments
brenzi Sep 13, 2024
69c796a
make account manage page scrollable
brenzi Sep 14, 2024
b5d46ee
prevent listView scrolling within scrollable page
brenzi Sep 14, 2024
e4c7b27
fix CI
brenzi Sep 14, 2024
725b09d
Merge branch 'master' into ab/remarks
brenzi Sep 14, 2024
a999d08
add AI translations
brenzi Sep 14, 2024
f5321b0
add AI translations
brenzi Sep 14, 2024
5bf8fa9
fix lints
clangenb Sep 18, 2024
4c37a0d
[send_tx] fix: use correct notification text and remove needless onFi…
clangenb Sep 18, 2024
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
193 changes: 98 additions & 95 deletions app/lib/page/profile/account/account_manage_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ class _AccountManagePageState extends State<AccountManagePage> {
_nameCtrl = TextEditingController(text: accountToBeEdited.name);
_nameCtrl!.selection = TextSelection.fromPosition(TextPosition(offset: _nameCtrl!.text.length));

// Not an ideal practice, but we only release a dev-version of the faucet, and cleanup can be later.
Widget benefits() {
if (faucets == null) {
return appConfig.isIntegrationTest ? const SizedBox.shrink() : const CupertinoActivityIndicator();
Expand All @@ -193,7 +192,6 @@ class _AccountManagePageState extends State<AccountManagePage> {
);
}

// Not an ideal practice, but we only release a dev-version of the faucet, and cleanup can be later ;-)
Widget remarks() {
return Remarks(
store,
Expand All @@ -203,6 +201,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
),
);
}

return Observer(
builder: (_) => Scaffold(
appBar: AppBar(
Expand Down Expand Up @@ -243,55 +242,62 @@ class _AccountManagePageState extends State<AccountManagePage> {
],
),
body: SafeArea(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
children: <Widget>[
const SizedBox(height: 20),
if (!isKeyboard)
AddressIcon(
addressSS58,
accountToBeEditedPubKey,
size: 130,
),
Text(
addressSS58,
key: const Key(EWTestKeys.accountPublicKey),
// Text only read `addressSS58` for integration test
style: const TextStyle(fontSize: 2, color: Colors.transparent),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
Fmt.address(addressSS58)!,
style: const TextStyle(fontSize: 20),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
IconButton(
icon: const Icon(Iconsax.copy),
color: context.colorScheme.secondary,
onPressed: () => UI.copyAndNotify(context, addressSS58),
),
],
),
Text(l10n.communities, style: h3Grey, textAlign: TextAlign.left),
ListView.builder(
shrinkWrap: true,
itemCount: store.encointer.accountStores!.containsKey(addressSS58)
? store.encointer.accountStores![addressSS58]?.balanceEntries.length ?? 0
: 0,
itemBuilder: (BuildContext context, int index) => _getBalanceEntryListTile(
index,
addressSS58,
child: Column(
children: [
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column(
children: <Widget>[
const SizedBox(height: 20),
if (!isKeyboard)
AddressIcon(
addressSS58,
accountToBeEditedPubKey,
size: 130,
),
Text(
addressSS58,
key: const Key(EWTestKeys.accountPublicKey),
style: const TextStyle(fontSize: 2, color: Colors.transparent),
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
Fmt.address(addressSS58)!,
style: const TextStyle(fontSize: 20),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
IconButton(
icon: const Icon(Iconsax.copy),
color: context.colorScheme.secondary,
onPressed: () => UI.copyAndNotify(context, addressSS58),
),
],
),
Text(l10n.communities, style: h3Grey, textAlign: TextAlign.left),
ListView.builder(
shrinkWrap: true,
itemCount: store.encointer.accountStores!.containsKey(addressSS58)
? store.encointer.accountStores![addressSS58]?.balanceEntries.length ?? 0
: 0,
itemBuilder: (BuildContext context, int index) => _getBalanceEntryListTile(
index,
addressSS58,
),
),
benefits(),
remarks(),
const SizedBox(height: 20),
],
),
),
benefits(),
remarks(),
const Spacer(),
DecoratedBox(
// width: double.infinity,
),
Padding(
padding: const EdgeInsets.all(16),
child: DecoratedBox(
decoration: BoxDecoration(
gradient: AppColors.primaryGradient(context),
borderRadius: BorderRadius.circular(20),
Expand All @@ -301,7 +307,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
ElevatedButton(
key: const Key(EWTestKeys.goToAccountShare),
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.all(16), // make splash animation as high as the container
padding: const EdgeInsets.all(16),
backgroundColor: Colors.transparent,
foregroundColor: Colors.white,
shadowColor: Colors.transparent,
Expand All @@ -322,55 +328,52 @@ class _AccountManagePageState extends State<AccountManagePage> {
),
const Spacer(),
PopupMenuButton<AccountAction>(
offset: const Offset(-10, -150),
icon: const Icon(
Iconsax.more,
key: Key(EWTestKeys.popupMenuAccountTrashExport),
color: Colors.white,
),
color: context.colorScheme.background,
padding: const EdgeInsets.all(20),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onSelected: (AccountAction accountAction) {
return switch (accountAction) {
AccountAction.delete => _onDeleteAccount(context, accountToBeEdited),
AccountAction.export => _showPasswordDialog(context, accountToBeEdited),
};
},
itemBuilder: (BuildContext context) => [
AccountActionItemData(
accountAction: AccountAction.delete,
icon: Iconsax.trash,
title: l10n.deleteAccount,
),
AccountActionItemData(
accountAction: AccountAction.export,
icon: Iconsax.export,
title: l10n.exportAccount),
]
.map((AccountActionItemData data) => PopupMenuItem<AccountAction>(
key: Key(data.accountAction.name),
value: data.accountAction,
// https://github.com/flutter/flutter/issues/31247 as soon as we use a newer flutter version we might be able to add this to our theme.dart
child: ListTileTheme(
textColor: context.colorScheme.secondary,
iconColor: context.colorScheme.secondary,
child: ListTile(
minLeadingWidth: 0,
title: Text(data.title),
leading: Icon(data.icon),
),
),
))
.toList() //<PopupMenuEntry<AccountAction>>,
offset: const Offset(-10, -150),
icon: const Icon(
Iconsax.more,
key: Key(EWTestKeys.popupMenuAccountTrashExport),
color: Colors.white,
),
color: context.colorScheme.background,
padding: const EdgeInsets.all(20),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
onSelected: (AccountAction accountAction) {
return switch (accountAction) {
AccountAction.delete => _onDeleteAccount(context, accountToBeEdited),
AccountAction.export => _showPasswordDialog(context, accountToBeEdited),
};
},
itemBuilder: (BuildContext context) => [
AccountActionItemData(
accountAction: AccountAction.delete,
icon: Iconsax.trash,
title: l10n.deleteAccount,
),
AccountActionItemData(
accountAction: AccountAction.export, icon: Iconsax.export, title: l10n.exportAccount),
]
.map((AccountActionItemData data) => PopupMenuItem<AccountAction>(
key: Key(data.accountAction.name),
value: data.accountAction,
child: ListTileTheme(
textColor: context.colorScheme.secondary,
iconColor: context.colorScheme.secondary,
child: ListTile(
minLeadingWidth: 0,
title: Text(data.title),
leading: Icon(data.icon),
),
),
))
.toList(),
),
],
),
),
],
),
),
],
),
),
),
Expand Down
4 changes: 1 addition & 3 deletions app/lib/page/profile/account/remark.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ class Remarks extends StatelessWidget {
onPressed: () async {
final remark = _remarkController.text;
if (remark.isNotEmpty) {
await _submitRemarkTx(
context,
remark);
await _submitRemarkTx(context, remark);
Navigator.of(context).pop();
}
},
Expand Down
16 changes: 7 additions & 9 deletions app/lib/service/tx/lib/src/submit_tx_wrappers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,13 @@ Future<void> submitClaimRewards(
}

Future<void> submitRemark(
BuildContext context,
AppStore store,
Api api,
KeyringAccount signer,
String remark,
{
required CommunityIdentifier? txPaymentAsset,
}
) async {
BuildContext context,
AppStore store,
Api api,
KeyringAccount signer,
String remark, {
required CommunityIdentifier? txPaymentAsset,
}) async {
final List<int> remarkList = remark.codeUnits;
final call = api.encointer.encointerKusama.tx.system.remarkWithEvent(remark: remarkList);
final xt = await TxBuilder(api.provider).createSignedExtrinsic(
Expand Down
6 changes: 3 additions & 3 deletions app/lib/service/tx/lib/src/tx_notification.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class TxNotification {
);

factory TxNotification.remark(AppLocalizations l10n) => TxNotification(
title: l10n.remarkNotificationTitle,
body: l10n.remarkNotificationBody,
);
title: l10n.remarkNotificationTitle,
body: l10n.remarkNotificationBody,
);

factory TxNotification.democracyVote(AppLocalizations l10n) => TxNotification(
title: l10n.democracyVotedNotificationTitle,
Expand Down
Loading