Merge pull request #1171 from cypherstack/ux-tweaks

Ux tweaks and various bug fixes

Author: julian-CStack

asset_sources/svg/campfire/socials/twitter-brands.svg

@@ -329,6 +329,10 @@ class TransactionV2 {
   bool isCoinbase() =>
       type == TransactionType.incoming && inputs.any((e) => e.coinbase != null);
 
+  @ignore
+  bool get isInstantLock =>
+      _getFromOtherData(key: TxV2OdKeys.isInstantLock) == true;
+
   @override
   String toString() {
     return 'TransactionV2(\n'
@@ -362,4 +366,5 @@ abstract final class TxV2OdKeys {
   static const moneroAmount = "moneroAmount";
   static const moneroAccountIndex = "moneroAccountIndex";
   static const isMoneroTransaction = "isMoneroTransaction";
+  static const isInstantLock = "isInstantLock";
 }

asset_sources/svg/campfire/socials/x.svg

@@ -46,21 +46,40 @@ class AddTokenListElement extends ConsumerStatefulWidget {
 class _AddTokenListElementState extends ConsumerState<AddTokenListElement> {
   final bool isDesktop = Util.isDesktop;
 
+  Currency? currency;
+
   @override
-  Widget build(BuildContext context) {
-    final currency =
-        ExchangeDataLoadingService.instance.isar.currencies
-            .where()
-            .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
-            .filter()
-            .tokenContractEqualTo(
-              widget.data.token.address,
-              caseSensitive: false,
-            )
-            .and()
-            .imageIsNotEmpty()
-            .findFirstSync();
+  void initState() {
+    super.initState();
+
+    ExchangeDataLoadingService.instance.isar.then((isar) async {
+      final currency =
+          await isar.currencies
+              .where()
+              .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+              .filter()
+              .tokenContractEqualTo(
+                widget.data.token.address,
+                caseSensitive: false,
+              )
+              .and()
+              .imageIsNotEmpty()
+              .findFirst();
 
+      if (mounted) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (mounted) {
+            setState(() {
+              this.currency = currency;
+            });
+          }
+        });
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final String mainLabel = widget.data.token.name;
     final double iconSize = isDesktop ? 32 : 24;
 
@@ -77,7 +96,7 @@ class _AddTokenListElementState extends ConsumerState<AddTokenListElement> {
             children: [
               currency != null
                   ? SvgPicture.network(
-                    currency.image,
+                    currency!.image,
                     width: iconSize,
                     height: iconSize,
                     placeholderBuilder:

asset_sources/svg/stack_duo/socials/twitter-brands.svg

@@ -28,47 +28,71 @@ import '../../../../utilities/constants.dart';
 import '../../../../utilities/text_styles.dart';
 import '../../../../utilities/util.dart';
 
-class CoinSelectItem extends ConsumerWidget {
+class CoinSelectItem extends ConsumerStatefulWidget {
   const CoinSelectItem({super.key, required this.entity});
 
   final AddWalletListEntity entity;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    debugPrint("BUILD: CoinSelectItem for ${entity.name}");
-    final selectedEntity = ref.watch(addWalletSelectedEntityStateProvider);
+  ConsumerState<CoinSelectItem> createState() => _CoinSelectItemState();
+}
 
-    final isDesktop = Util.isDesktop;
+class _CoinSelectItemState extends ConsumerState<CoinSelectItem> {
+  String? tokenImageUri;
 
-    String? tokenImageUri;
-    if (entity is EthTokenEntity) {
-      final currency =
-          ExchangeDataLoadingService.instance.isar.currencies
-              .where()
-              .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
-              .filter()
-              .tokenContractEqualTo(
-                (entity as EthTokenEntity).token.address,
-                caseSensitive: false,
-              )
-              .and()
-              .imageIsNotEmpty()
-              .findFirstSync();
-      tokenImageUri = currency?.image;
+  @override
+  void initState() {
+    super.initState();
+
+    if (widget.entity is EthTokenEntity) {
+      ExchangeDataLoadingService.instance.isar.then((isar) async {
+        final currency =
+            await isar.currencies
+                .where()
+                .exchangeNameEqualTo(ChangeNowExchange.exchangeName)
+                .filter()
+                .tokenContractEqualTo(
+                  (widget.entity as EthTokenEntity).token.address,
+                  caseSensitive: false,
+                )
+                .and()
+                .imageIsNotEmpty()
+                .findFirst();
+
+        if (mounted) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            if (mounted) {
+              setState(() {
+                tokenImageUri = currency?.image;
+              });
+            }
+          });
+        }
+      });
     }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("BUILD: CoinSelectItem for ${widget.entity.name}");
+    final selectedEntity = ref.watch(addWalletSelectedEntityStateProvider);
+
+    final isDesktop = Util.isDesktop;
 
     return Container(
       decoration: BoxDecoration(
         color:
-            selectedEntity == entity
+            selectedEntity == widget.entity
                 ? Theme.of(context).extension<StackColors>()!.textFieldActiveBG
                 : Theme.of(context).extension<StackColors>()!.popupBG,
         borderRadius: BorderRadius.circular(
           Constants.size.circularBorderRadius,
         ),
       ),
       child: MaterialButton(
-        key: Key("coinSelectItemButtonKey_${entity.name}${entity.ticker}"),
+        key: Key(
+          "coinSelectItemButtonKey_${widget.entity.name}${widget.entity.ticker}",
+        ),
         padding:
             isDesktop
                 ? const EdgeInsets.only(left: 24)
@@ -84,24 +108,26 @@ class CoinSelectItem extends ConsumerWidget {
           child: Row(
             children: [
               tokenImageUri != null
-                  ? SvgPicture.network(tokenImageUri, width: 26, height: 26)
+                  ? SvgPicture.network(tokenImageUri!, width: 26, height: 26)
                   : SvgPicture.file(
-                    File(ref.watch(coinIconProvider(entity.cryptoCurrency))),
+                    File(
+                      ref.watch(coinIconProvider(widget.entity.cryptoCurrency)),
+                    ),
                     width: 26,
                     height: 26,
                   ),
               SizedBox(width: isDesktop ? 12 : 10),
               Text(
-                "${entity.name} (${entity.ticker})",
+                "${widget.entity.name} (${widget.entity.ticker})",
                 style:
                     isDesktop
                         ? STextStyles.desktopTextMedium(context)
                         : STextStyles.subtitle600(
                           context,
                         ).copyWith(fontSize: 14),
               ),
-              if (isDesktop && selectedEntity == entity) const Spacer(),
-              if (isDesktop && selectedEntity == entity)
+              if (isDesktop && selectedEntity == widget.entity) const Spacer(),
+              if (isDesktop && selectedEntity == widget.entity)
                 Padding(
                   padding: const EdgeInsets.only(right: 18),
                   child: SizedBox(
@@ -120,7 +146,8 @@ class CoinSelectItem extends ConsumerWidget {
           ),
         ),
         onPressed: () {
-          ref.read(addWalletSelectedEntityStateProvider.state).state = entity;
+          ref.read(addWalletSelectedEntityStateProvider.state).state =
+              widget.entity;
         },
       ),
     );

asset_sources/svg/stack_duo/socials/x.svg

@@ -30,7 +30,7 @@ class ExpandingSubListItem extends StatefulWidget {
     double? animationDurationMultiplier,
     this.curve = Curves.easeInOutCubicEmphasized,
   }) : animationDurationMultiplier =
-            animationDurationMultiplier ?? entities.length * 0.11;
+           animationDurationMultiplier ?? entities.length * 0.11;
 
   final String title;
   final List<AddWalletListEntity> entities;
@@ -85,33 +85,32 @@ class _ExpandingSubListItemState extends State<ExpandingSubListItem> {
       header: Container(
         color: Colors.transparent,
         child: Padding(
-          padding: const EdgeInsets.only(
-            top: 8.0,
-            bottom: 8.0,
-            right: 10,
-          ),
+          padding: const EdgeInsets.only(top: 8.0, bottom: 8.0, right: 10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               Text(
                 widget.title,
-                style: isDesktop
-                    ? STextStyles.desktopTextMedium(context).copyWith(
-                        color: Theme.of(context)
-                            .extension<StackColors>()!
-                            .textDark3,
-                      )
-                    : STextStyles.smallMed12(context),
+                style:
+                    isDesktop
+                        ? STextStyles.desktopTextMedium(context).copyWith(
+                          color:
+                              Theme.of(
+                                context,
+                              ).extension<StackColors>()!.textDark3,
+                        )
+                        : STextStyles.smallMed12(context),
                 textAlign: TextAlign.left,
               ),
               RotateIcon(
                 icon: SvgPicture.asset(
                   Assets.svg.chevronDown,
                   width: isDesktop ? 20 : 12,
                   height: isDesktop ? 10 : 6,
-                  color: Theme.of(context)
-                      .extension<StackColors>()!
-                      .textFieldActiveSearchIconRight,
+                  color:
+                      Theme.of(context)
+                          .extension<StackColors>()!
+                          .textFieldActiveSearchIconRight,
                 ),
                 curve: widget.curve,
                 animationDurationMultiplier: widget.animationDurationMultiplier,