Merge pull request #632 from cypherstack/ordinals

Fix ordinals null issue and re-add to UI
cypherstack · Jul 27, 2023 · 2bc9813 · 2bc9813
2 parents 44aab53 + c44623a
commit 2bc9813
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/...pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart b/...pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
@@ -354,7 +354,7 @@ class _DesktopWalletFeaturesState extends ConsumerState<DesktopWalletFeatures> {
         manager.coin == Coin.firoTestNet ||
         manager.hasWhirlpoolSupport ||
         manager.coin == Coin.banano ||
-        manager.hasWhirlpoolSupport;
+        manager.hasOrdinalsSupport;
     return Row(
       children: [
         if (Constants.enableExchange)

diff --git a/lib/services/litescribe_api.dart b/lib/services/litescribe_api.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
-import 'package:http/http.dart' as http;
 
+import 'package:http/http.dart' as http;
 import 'package:stackwallet/dto/ordinals/inscription_data.dart';
 import 'package:stackwallet/dto/ordinals/litescribe_response.dart';
 
@@ -21,7 +21,8 @@ class LitescribeAPI {
     if (response.statusCode == 200) {
       return LitescribeResponse(data: _validateJson(response.body));
     } else {
-      throw Exception('LitescribeAPI _getResponse exception: Failed to load data');
+      throw Exception(
+          'LitescribeAPI _getResponse exception: Failed to load data');
     }
   }
 
@@ -30,39 +31,49 @@ class LitescribeAPI {
     if (parsed is Map<String, dynamic>) {
       return parsed;
     } else {
-      throw const FormatException('LitescribeAPI _validateJson exception: Invalid JSON format');
+      throw const FormatException(
+          'LitescribeAPI _validateJson exception: Invalid JSON format');
     }
   }
 
-  Future<List<InscriptionData>> getInscriptionsByAddress(String address, {int cursor = 0, int size = 1000}) async {
+  Future<List<InscriptionData>> getInscriptionsByAddress(String address,
+      {int cursor = 0, int size = 1000}) async {
     // size param determines how many inscriptions are returned per response
     // default of 1000 is used to cover most addresses (I assume)
     // if the total number of inscriptions at the address exceeds the length of the list of inscriptions returned, another call with a higher size is made
     final int defaultLimit = 1000;
-    final response = await _getResponse('/address/inscriptions?address=$address&cursor=$cursor&size=$size');
+    final response = await _getResponse(
+        '/address/inscriptions?address=$address&cursor=$cursor&size=$size');
 
     // Check if the number of returned inscriptions equals the limit
-    final list = response.data['result']['list'];
     final int total = response.data['result']['total'] as int;
-    final int currentSize = list.length as int;
+
+    int currentSize = 0;
+    if (total == 0) {
+      return <InscriptionData>[];
+    }
+
+    final list = response.data['result']!['list'];
+    currentSize = list.length as int;
 
     if (currentSize == size && currentSize < total) {
       // If the number of returned inscriptions equals the limit and there are more inscriptions available,
       // increment the cursor and make the next API call to fetch the remaining inscriptions.
       final int newCursor = cursor + size;
       return getInscriptionsByAddress(address, cursor: newCursor, size: size);
-
     } else {
       try {
         // Iterate through the list and create InscriptionData objects from each element
         final List<InscriptionData> inscriptions = (list as List<dynamic>)
-            .map((json) => InscriptionData.fromJson(json as Map<String, dynamic>))
+            .map((json) =>
+                InscriptionData.fromJson(json as Map<String, dynamic>))
             .toList();
 
         return inscriptions;
       } catch (e) {
-        throw const FormatException('LitescribeAPI getInscriptionsByAddress exception: AddressInscriptionResponse.fromJson failure');
+        throw const FormatException(
+            'LitescribeAPI getInscriptionsByAddress exception: AddressInscriptionResponse.fromJson failure');
       }
     }
   }
-}
+}
diff --git a/test/widget_tests/table_view/table_view_row_test.mocks.dart b/test/widget_tests/table_view/table_view_row_test.mocks.dart
@@ -2203,6 +2203,11 @@ class MockManager extends _i1.Mock implements _i6.Manager {
         returnValue: false,
       ) as bool);
   @override
+  bool get hasFusionSupport => (super.noSuchMethod(
+        Invocation.getter(#hasFusionSupport),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get hasTokenSupport => (super.noSuchMethod(
         Invocation.getter(#hasTokenSupport),
         returnValue: false,