added empty state in token page (#229)

fuseio · Sep 15, 2020 · 6d8ba15 · 6d8ba15
1 parent 1a19f8e
commit 6d8ba15
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 21 deletions.
diff --git a/assets/images/no-activity.png b/assets/images/no-activity.png
diff --git a/i18n/en-US.json b/i18n/en-US.json
@@ -124,5 +124,8 @@
     "selected": "Selected",
     "fee_amount": "Fee amount:",
     "total_amount": "Total amount:",
-    "pay_with": "Pay with"
+    "pay_with": "Pay with",
+    "transaction_failed": "Transaction failed",
+    "something_went_wrong": "Something went wrong",
+    "no_activity": "No activity"
 }
diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart
@@ -284,6 +284,12 @@ class I18n implements WidgetsLocalizations {
   String get total_amount => "Total amount:";
   /// "Pay with"
   String get pay_with => "Pay with";
+  /// "Transaction failed"
+  String get transaction_failed => "Transaction failed";
+  /// "Something went wrong"
+  String get something_went_wrong => "Something went wrong";
+  /// "No activity"
+  String get no_activity => "No activity";
 }
 
 class _I18n_en_US extends I18n {

diff --git a/lib/models/jobs/join_bonus_job.dart b/lib/models/jobs/join_bonus_job.dart
@@ -33,13 +33,6 @@ class JoinBonusJob extends Job {
   @override
   onDone(store, dynamic fetchedData) async {
     final logger = await AppFactory().getLogger('Job');
-    if (isReported == true) {
-      logger.info('joinBonus FAILED');
-      store.dispatch(transactionFailed(arguments['joinBonus'], arguments['communityAddress']));
-      store.dispatch(segmentTrackCall('Wallet: joinBonus failed'));
-      store.dispatch(UpdateJob(communityAddress: arguments['communityAddress'], job: this));
-      return;
-    }
     int current = DateTime.now().millisecondsSinceEpoch;
     int jobTime = this.timeStart;
     final int millisecondsIntoMin = 2 * 60 * 1000;
@@ -77,13 +70,6 @@ class JoinBonusJob extends Job {
         return;
       }
     } else {
-      if (fetchedData['failReason'] != null && fetchedData['failedAt'] != null) {
-        logger.info('JoinBonusJob FAILED');
-        String failReason = fetchedData['failReason'];
-        store.dispatch(transactionFailed(arguments['joinBonus'], arguments['communityAddress']));
-        store.dispatch(segmentTrackCall('Wallet: job failed', properties: new Map<String, dynamic>.from({ 'id': id, 'failReason': failReason, 'name': name })));
-        return;
-      }
       if (fetchedData['data']['funderJobId'] != null) {
         String funderJobId = fetchedData['data']['funderJobId'];
         dynamic response = await api.getFunderJob(funderJobId);
@@ -115,6 +101,11 @@ class JoinBonusJob extends Job {
           store.dispatch(transactionFailed(arguments['joinBonus'], arguments['communityAddress']));
           return;
         }
+      } else {
+        this.status = 'FAILED';
+        logger.info('JoinBonusJob FAILED');
+        store.dispatch(UpdateJob(communityAddress: arguments['communityAddress'], job: this));
+        return;
       }
     }
   }

diff --git a/lib/screens/home/screens/token_screen.dart b/lib/screens/home/screens/token_screen.dart
@@ -20,6 +20,8 @@ class TokenScreen extends StatelessWidget {
         builder: (_, viewModel) {
           final token = viewModel.tokens
               .firstWhere((element) => element.address == tokenAddress);
+          final List<Transaction> list =
+              token?.transactions?.list?.reversed?.toList() ?? [];
           return Scaffold(
               key: key,
               appBar: MyAppBar(
@@ -28,12 +30,31 @@ class TokenScreen extends StatelessWidget {
                   backgroundColor: Colors.white),
               drawerEdgeDragWidth: 0,
               body: Column(children: <Widget>[
-                Expanded(
-                    child: ListView(children: [
-                  TransfersList(
-                      list:
-                          (token?.transactions?.list?.reversed?.toList() ?? []))
-                ])),
+                list.isEmpty
+                    ? Flexible(
+                        child: Center(
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Image.asset(
+                                'assets/images/no-activity.png',
+                                fit: BoxFit.cover,
+                                height: 100,
+                              ),
+                              SizedBox(
+                                height: 10,
+                              ),
+                              Text(I18n.of(context).no_activity,
+                                  style: TextStyle(
+                                      color: Color(0xFF979797),
+                                      fontSize: 16.0,
+                                      fontWeight: FontWeight.normal))
+                            ],
+                          ),
+                        ),
+                      )
+                    : Expanded(
+                        child: ListView(children: [TransfersList(list: list)])),
               ]));
         });
   }