Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-18 08:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable segwit paynym claiming and disable follow/unfollow due to server token signing not working

Browse source
This commit is contained in:
julian 2024-11-22 13:01:23 -06:00
parent 7511ce2ac3
commit 9a2589b4c3
8 changed files with 167 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pages/paynym/dialogs/paynym_details_popup.dart
View file

@ -382,7 +382,9 @@ class _PaynymDetailsPopupState extends ConsumerState<PaynymDetailsPopup> {
),
child: Row(
children: [
Expanded(
kDisableFollowing
? const Spacer()
: Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.accountLite.code,

75
lib/pages/paynym/paynym_claim_view.dart
View file

@ -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';
@ -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) {
@ -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) {
@ -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!;

13
lib/pages/paynym/paynym_home_view.dart
View file

@ -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';
@ -121,7 +122,9 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
),
],
),
trailing: Padding(
trailing: kDisableFollowing
? null
: Padding(
padding: const EdgeInsets.only(right: 12),
child: SizedBox(
height: 56,
@ -143,7 +146,8 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
);
},
child: RoundedContainer(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
padding:
const EdgeInsets.symmetric(horizontal: 24.0),
color: _followButtonHoverState
? Theme.of(context)
.extension<StackColors>()!
@ -168,8 +172,8 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
children: [
Text(
"Follow",
style:
STextStyles.desktopButtonSecondaryEnabled(
style: STextStyles
.desktopButtonSecondaryEnabled(
context,
).copyWith(
fontSize: 16,
@ -201,6 +205,7 @@ class _PaynymHomeViewState extends ConsumerState<PaynymHomeView> {
overflow: TextOverflow.ellipsis,
),
actions: [
if (!kDisableFollowing)
Padding(
padding: const EdgeInsets.symmetric(vertical: 6),
child: AspectRatio(

10
lib/pages/paynym/subwidgets/desktop_paynym_details.dart
View file

@ -284,11 +284,15 @@ class _PaynymDetailsPopupState extends ConsumerState<DesktopPaynymDetails> {
const SizedBox(
width: 20,
),
Expanded(
kDisableFollowing
? const Spacer()
: Expanded(
child: PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.accountLite.code,
style: PaynymFollowToggleButtonStyle.detailsDesktop,
paymentCodeStringToFollow:
widget.accountLite.code,
style:
PaynymFollowToggleButtonStyle.detailsDesktop,
),
),
],

4
lib/pages/paynym/subwidgets/paynym_card.dart
View file

@ -9,12 +9,13 @@
*/
import 'package:flutter/material.dart';
import 'paynym_bot.dart';
import '../../../themes/stack_colors.dart';
import '../../../utilities/format.dart';
import '../../../utilities/text_styles.dart';
import '../../../utilities/util.dart';
import '../../../widgets/custom_buttons/paynym_follow_toggle_button.dart';
import 'paynym_bot.dart';
class PaynymCard extends StatefulWidget {
const PaynymCard({
@ -84,6 +85,7 @@ class _PaynymCardState extends State<PaynymCard> {
],
),
),
if (!kDisableFollowing)
PaynymFollowToggleButton(
walletId: widget.walletId,
paymentCodeStringToFollow: widget.paymentCodeString,

6
lib/pages/wallet_view/wallet_view.dart
View file

@ -1175,8 +1175,10 @@ class _WalletViewState extends ConsumerState<WalletView> {
// check if account exists and for matching code to see if claimed
if (account.value != null &&
account.value!.nonSegwitPaymentCode.claimed &&
account.value!.segwit) {
account.value!.nonSegwitPaymentCode.claimed
// &&
// account.value!.segwit
) {
ref.read(myPaynymAccountStateProvider.state).state =
account.value!;

9
lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
View file

@ -302,13 +302,14 @@ class _DesktopWalletFeaturesState extends ConsumerState<DesktopWalletFeatures> {
level: LogLevel.Info,
);
if (context.mounted) {
if (mounted) {
Navigator.of(context, rootNavigator: true).pop();
// check if account exists and for matching code to see if claimed
if (account.value != null &&
account.value!.nonSegwitPaymentCode.claimed &&
account.value!.segwit) {
if (account.value != null && account.value!.nonSegwitPaymentCode.claimed
// &&
// account.value!.segwit
) {
ref.read(myPaynymAccountStateProvider.state).state = account.value!;
await Navigator.of(context).pushNamed(

16
lib/widgets/custom_buttons/paynym_follow_toggle_button.dart
View file

@ -34,6 +34,8 @@ enum PaynymFollowToggleButtonStyle {
detailsDesktop,
}
const kDisableFollowing = true;
class PaynymFollowToggleButton extends ConsumerStatefulWidget {
const PaynymFollowToggleButton({
super.key,
@ -55,7 +57,7 @@ class _PaynymFollowToggleButtonState
extends ConsumerState<PaynymFollowToggleButton> {
final isDesktop = Util.isDesktop;
Future<bool> follow() async {
Future<bool> _follow() async {
bool loadingPopped = false;
unawaited(
showDialog<void>(
@ -160,7 +162,7 @@ class _PaynymFollowToggleButtonState
}
}
Future<bool> unfollow() async {
Future<bool> _unfollow() async {
bool loadingPopped = false;
unawaited(
showDialog<void>(
@ -264,9 +266,9 @@ class _PaynymFollowToggleButtonState
if (!_lock) {
_lock = true;
if (isFollowing) {
await unfollow();
await _unfollow();
} else {
await follow();
await _follow();
}
_lock = false;
}
@ -291,7 +293,7 @@ class _PaynymFollowToggleButtonState
width: isDesktop ? 120 : 100,
buttonHeight: isDesktop ? ButtonHeight.s : ButtonHeight.xl,
label: isFollowing ? "Unfollow" : "Follow",
onPressed: _onPressed,
onPressed: kDisableFollowing ? null : _onPressed,
);
case PaynymFollowToggleButtonStyle.detailsPopup:
@ -306,7 +308,7 @@ class _PaynymFollowToggleButtonState
color:
Theme.of(context).extension<StackColors>()!.buttonTextSecondary,
),
onPressed: _onPressed,
onPressed: kDisableFollowing ? null : _onPressed,
);
case PaynymFollowToggleButtonStyle.detailsDesktop:
@ -321,7 +323,7 @@ class _PaynymFollowToggleButtonState
Theme.of(context).extension<StackColors>()!.buttonTextSecondary,
),
iconSpacing: 6,
onPressed: _onPressed,
onPressed: kDisableFollowing ? null : _onPressed,
);
}
}