Skip to content

Various changes #1034

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

Merged
rehrar merged 5 commits into from
Nov 22, 2024
Merged

Various changes #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7511ce2
Enable frost on desktop. Not sure why it was disabled. I guess we'll …
julian-CStack Nov 22, 2024
9a2589b
disable segwit paynym claiming and disable follow/unfollow due to ser…
julian-CStack Nov 22, 2024
2431d5f
churn gif
julian-CStack Nov 22, 2024
537e44f
modify default themes install/loading/checks. Should fix missing ada …
julian-CStack Nov 22, 2024
d8ec93f
add copy button to txid field in tx details on mobile
julian-CStack Nov 22, 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
Binary file added assets/gif/monero-chan-dance.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart';
Expand Down Expand Up @@ -131,11 +130,6 @@ class _AddWalletViewState extends ConsumerState<AddWalletView> {
void initState() {
_searchFieldController = TextEditingController();
_searchFocusNode = FocusNode();
// _coinsTestnet.remove(Coin.firoTestNet);

if (Util.isDesktop && !kDebugMode) {
_coins.removeWhere((e) => e is BitcoinFrost);
}

coinEntities.addAll(_coins.map((e) => CoinEntity(e)));

Expand Down
5 changes: 5 additions & 0 deletions lib/pages/churning/churning_progress_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import '../../widgets/churning/churn_progress_item.dart';
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../widgets/desktop/primary_button.dart';
import '../../widgets/desktop/secondary_button.dart';
import '../../widgets/monero_chan_dance.dart';
import '../../widgets/rounded_container.dart';
import '../../widgets/stack_dialog.dart';
import 'churn_error_dialog.dart';
Expand Down Expand Up @@ -185,6 +186,10 @@ class _ChurningProgressViewState extends ConsumerState<ChurningProgressView> {
const SizedBox(
height: 20,
),
const MoneroChanDance(),
const SizedBox(
height: 20,
),
ProgressItem(
iconAsset: Assets.svg.alertCircle,
label: "Waiting for balance to unlock ${ref.watch(
Expand Down
16 changes: 9 additions & 7 deletions lib/pages/paynym/dialogs/paynym_details_popup.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,15 @@ class _PaynymDetailsPopupState extends ConsumerState<PaynymDetailsPopup> {
),
child: Row(
children: [
Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.accountLite.code,
style: PaynymFollowToggleButtonStyle.detailsPopup,
),
),
kDisableFollowing
? const Spacer()
: Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.accountLite.code,
style: PaynymFollowToggleButtonStyle.detailsPopup,
),
),
const SizedBox(
width: 12,
),
Expand Down
75 changes: 37 additions & 38 deletions lib/pages/paynym/paynym_claim_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart';

import '../../models/paynym/paynym_account.dart';
import '../../providers/global/paynym_api_provider.dart';
import '../../providers/global/wallets_provider.dart';
import '../../providers/wallet/my_paynym_account_state_provider.dart';
Expand Down Expand Up @@ -47,25 +46,25 @@ class PaynymClaimView extends ConsumerStatefulWidget {
}

class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
Future<bool> _addSegwitCode(PaynymAccount myAccount) async {
final wallet =
ref.read(pWallets).getWallet(widget.walletId) as PaynymInterface;

final token = await ref
.read(paynymAPIProvider)
.token(myAccount.nonSegwitPaymentCode.code);
final signature = await wallet.signStringWithNotificationKey(token.value!);

final pCodeSegwit = await wallet.getPaymentCode(isSegwit: true);
final addResult = await ref.read(paynymAPIProvider).add(
token.value!,
signature,
myAccount.nymID,
pCodeSegwit.toString(),
);

return addResult.value ?? false;
}
// Future<bool> _addSegwitCode(PaynymAccount myAccount) async {
// final wallet =
// ref.read(pWallets).getWallet(widget.walletId) as PaynymInterface;
//
// final token = await ref
// .read(paynymAPIProvider)
// .token(myAccount.nonSegwitPaymentCode.code);
// final signature = await wallet.signStringWithNotificationKey(token.value!);
//
// final pCodeSegwit = await wallet.getPaymentCode(isSegwit: true);
// final addResult = await ref.read(paynymAPIProvider).add(
// token.value!,
// signature,
// myAccount.nymID,
// pCodeSegwit.toString(),
// );
//
// return addResult.value ?? false;
// }

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -210,16 +209,16 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
// payment code already claimed
debugPrint("pcode already claimed!!");

final account =
await ref.read(paynymAPIProvider).nym(pCode.toString());
if (!account.value!.segwit) {
for (int i = 0; i < 100; i++) {
final result = await _addSegwitCode(account.value!);
if (result == true) {
break;
}
}
}
// final account =
// await ref.read(paynymAPIProvider).nym(pCode.toString());
// if (!account.value!.segwit) {
// for (int i = 0; i < 100; i++) {
// final result = await _addSegwitCode(account.value!);
// if (result == true) {
// break;
// }
// }
// }

if (mounted) {
if (isDesktop) {
Expand Down Expand Up @@ -259,14 +258,14 @@ class _PaynymClaimViewState extends ConsumerState<PaynymClaimView> {
if (claim.value?.claimed == pCode.toString()) {
final account =
await ref.read(paynymAPIProvider).nym(pCode.toString());
if (!account.value!.segwit) {
for (int i = 0; i < 100; i++) {
final result = await _addSegwitCode(account.value!);
if (result == true) {
break;
}
}
}
// if (!account.value!.segwit) {
// for (int i = 0; i < 100; i++) {
// final result = await _addSegwitCode(account.value!);
// if (result == true) {
// break;
// }
// }
// }

ref.read(myPaynymAccountStateProvider.state).state =
account.value!;
Expand Down
165 changes: 85 additions & 80 deletions lib/pages/paynym/paynym_home_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import '../../utilities/text_styles.dart';
import '../../utilities/util.dart';
import '../../widgets/conditional_parent.dart';
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../widgets/custom_buttons/paynym_follow_toggle_button.dart';
import '../../widgets/desktop/desktop_app_bar.dart';
import '../../widgets/desktop/desktop_scaffold.dart';
import '../../widgets/desktop/secondary_button.dart';
Expand Down Expand Up @@ -121,72 +122,75 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
),
],
),
trailing: Padding(
padding: const EdgeInsets.only(right: 12),
child: SizedBox(
height: 56,
child: MouseRegion(
cursor: SystemMouseCursors.click,
onEnter: (_) => setState(() {
_followButtonHoverState = true;
}),
onExit: (_) => setState(() {
_followButtonHoverState = false;
}),
child: GestureDetector(
onTap: () {
showDialog<void>(
context: context,
builder: (context) => AddNewPaynymFollowView(
walletId: widget.walletId,
),
);
},
child: RoundedContainer(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
color: _followButtonHoverState
? Theme.of(context)
.extension<StackColors>()!
.highlight
: Colors.transparent,
radiusMultiplier: 100,
child: Row(
children: [
SvgPicture.asset(
Assets.svg.plus,
width: 16,
height: 16,
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
const SizedBox(
width: 8,
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"Follow",
style:
STextStyles.desktopButtonSecondaryEnabled(
context,
).copyWith(
fontSize: 16,
),
),
const SizedBox(
height: 2,
trailing: kDisableFollowing
? null
: Padding(
padding: const EdgeInsets.only(right: 12),
child: SizedBox(
height: 56,
child: MouseRegion(
cursor: SystemMouseCursors.click,
onEnter: (_) => setState(() {
_followButtonHoverState = true;
}),
onExit: (_) => setState(() {
_followButtonHoverState = false;
}),
child: GestureDetector(
onTap: () {
showDialog<void>(
context: context,
builder: (context) => AddNewPaynymFollowView(
walletId: widget.walletId,
),
],
);
},
child: RoundedContainer(
padding:
const EdgeInsets.symmetric(horizontal: 24.0),
color: _followButtonHoverState
? Theme.of(context)
.extension<StackColors>()!
.highlight
: Colors.transparent,
radiusMultiplier: 100,
child: Row(
children: [
SvgPicture.asset(
Assets.svg.plus,
width: 16,
height: 16,
color: Theme.of(context)
.extension<StackColors>()!
.textDark,
),
const SizedBox(
width: 8,
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"Follow",
style: STextStyles
.desktopButtonSecondaryEnabled(
context,
).copyWith(
fontSize: 16,
),
),
const SizedBox(
height: 2,
),
],
),
],
),
),
],
),
),
),
),
),
),
),
)
: AppBar(
leading: AppBarBackButton(
Expand All @@ -201,28 +205,29 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
overflow: TextOverflow.ellipsis,
),
actions: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: AspectRatio(
aspectRatio: 1,
child: AppBarIconButton(
icon: SvgPicture.asset(
Assets.svg.circlePlusFilled,
width: 20,
height: 20,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
if (!kDisableFollowing)
Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: AspectRatio(
aspectRatio: 1,
child: AppBarIconButton(
icon: SvgPicture.asset(
Assets.svg.circlePlusFilled,
width: 20,
height: 20,
color: Theme.of(context)
.extension<StackColors>()!
.accentColorDark,
),
onPressed: () {
Navigator.of(context).pushNamed(
AddNewPaynymFollowView.routeName,
arguments: widget.walletId,
);
},
),
onPressed: () {
Navigator.of(context).pushNamed(
AddNewPaynymFollowView.routeName,
arguments: widget.walletId,
);
},
),
),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: AspectRatio(
Expand Down
18 changes: 11 additions & 7 deletions lib/pages/paynym/subwidgets/desktop_paynym_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,17 @@ class _PaynymDetailsPopupState extends ConsumerState<DesktopPaynymDetails> {
const SizedBox(
width: 20,
),
Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.accountLite.code,
style: PaynymFollowToggleButtonStyle.detailsDesktop,
),
),
kDisableFollowing
? const Spacer()
: Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow:
widget.accountLite.code,
style:
PaynymFollowToggleButtonStyle.detailsDesktop,
),
),
],
),
if (_showInsufficientFundsInfo)
Expand Down
Loading
Loading