github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-20 06:08:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

CW-1190: Minor Fixes (#2614)

Browse Source 
* fix: Enhance WalletConnect URI handling and validation, better handle errors

* fix: Disable swipe to send if wallet is not synchronized

* fix: Handle session expiry gracefully

* fix: Disable swipe to send if wallet is not synced
This commit is contained in:
David Adegoke
2025-11-08 22:46:51 +01:00
committed by GitHub
parent ddf6043ed9
commit 9fa4584d97
9 changed files with 79 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart
+3
View File
@@ -12,6 +12,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
required this.footerType,
this.slideActionButtonText,
this.onSlideActionComplete,
this.isSlideActionEnabled = true,
this.singleActionButtonText,
this.accessibleNavigationModeSlideActionButtonText,
this.onSingleActionButtonPressed,
@@ -30,6 +31,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
final FooterType footerType;
final String? slideActionButtonText;
final VoidCallback? onSlideActionComplete;
final bool isSlideActionEnabled;
final String? singleActionButtonText;
final String? accessibleNavigationModeSlideActionButtonText;
final VoidCallback? onSingleActionButtonPressed;
@@ -112,6 +114,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
buttonText: slideActionButtonText ?? '',
onSlideComplete: onSlideActionComplete ?? () {},
accessibleNavigationModeButtonText: accessibleNavigationModeSlideActionButtonText ?? '',
isDisabled: !isSlideActionEnabled,
),
);
lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
+2
View File
@@ -21,6 +21,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
String? titleIconPath,
String? slideActionButtonText,
VoidCallback? onSlideActionComplete,
bool isSlideActionEnabled = true,
String? accessibleNavigationModeSlideActionButtonText,
required this.currency,
this.paymentId,
@@ -48,6 +49,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
footerType: footerType,
slideActionButtonText: slideActionButtonText ?? 'Swipe to send',
onSlideActionComplete: onSlideActionComplete,
isSlideActionEnabled: isSlideActionEnabled,
accessibleNavigationModeSlideActionButtonText:
accessibleNavigationModeSlideActionButtonText,
key: key);
lib/src/widgets/standard_slide_button_widget.dart
+30 -19
View File
@@ -11,6 +11,7 @@ class StandardSlideButton extends StatefulWidget {
required this.accessibleNavigationModeButtonText,
this.tileBackgroundColor,
this.knobColor,
this.isDisabled = false,
}) : super(key: key);
final VoidCallback onSlideComplete;
@@ -19,6 +20,7 @@ class StandardSlideButton extends StatefulWidget {
final String accessibleNavigationModeButtonText;
final Color? tileBackgroundColor;
final Color? knobColor;
final bool isDisabled;
@override
StandardSlideButtonState createState() => StandardSlideButtonState();
@@ -36,14 +38,16 @@ class StandardSlideButtonState extends State<StandardSlideButton> {
Widget build(BuildContext context) {
final bool accessible = MediaQuery.of(context).accessibleNavigation;
final tileBackgroundColor = context.currentTheme.customColors.backgroundGradientColor;
final tileBackgroundColor = widget.isDisabled
? context.currentTheme.customColors.backgroundGradientColor.withOpacity(0.5)
: context.currentTheme.customColors.backgroundGradientColor;
return accessible
? PrimaryButton(
text: widget.accessibleNavigationModeButtonText,
color: Theme.of(context).colorScheme.primary,
textColor: Theme.of(context).colorScheme.onPrimary,
onPressed: () => widget.onSlideComplete(),
onPressed: widget.isDisabled ? null : () => widget.onSlideComplete(),
)
: LayoutBuilder(
builder: (context, constraints) {
@@ -56,7 +60,10 @@ class StandardSlideButtonState extends State<StandardSlideButton> {
height: widget.height,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: widget.tileBackgroundColor ?? tileBackgroundColor,
color: (widget.isDisabled
? widget.tileBackgroundColor?.withOpacity(0.5)
: widget.tileBackgroundColor) ??
tileBackgroundColor,
),
child: Stack(
alignment: Alignment.centerLeft,
@@ -74,22 +81,26 @@ class StandardSlideButtonState extends State<StandardSlideButton> {
left: sideMargin + _dragPosition,
child: GestureDetector(
key: ValueKey('standard_slide_button_widget_slider_key'),
onHorizontalDragUpdate: (details) {
setState(() {
_dragPosition += details.delta.dx;
if (_dragPosition < 0) _dragPosition = 0;
if (_dragPosition > effectiveMaxWidth - sliderWidth) {
_dragPosition = effectiveMaxWidth - sliderWidth;
}
});
},
onHorizontalDragEnd: (details) {
if (_dragPosition >= effectiveMaxWidth - sliderWidth - 10) {
widget.onSlideComplete();
} else {
setState(() => _dragPosition = 0);
}
},
onHorizontalDragUpdate: widget.isDisabled
? null
: (details) {
setState(() {
_dragPosition += details.delta.dx;
if (_dragPosition < 0) _dragPosition = 0;
if (_dragPosition > effectiveMaxWidth - sliderWidth) {
_dragPosition = effectiveMaxWidth - sliderWidth;
}
});
},
onHorizontalDragEnd: widget.isDisabled
? null
: (details) {
if (_dragPosition >= effectiveMaxWidth - sliderWidth - 10) {
widget.onSlideComplete();
} else {
setState(() => _dragPosition = 0);
}
},
child: Container(
key: ValueKey('standard_slide_button_widget_slider_container_key'),
width: sliderWidth,