From 48e2b09b2276bf9b7d615fa23828b94e90e5770d Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Mon, 6 Jun 2022 17:05:35 +0200
Subject: [PATCH] fix: layout cert message; show renewable message before cert
 delay

---
 lib/providers/substrate_sdk.dart | 10 +++++-----
 lib/screens/wallet_view.dart     |  2 +-
 pubspec.yaml                     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index bc6a662..ed68b83 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -597,14 +597,14 @@ class SubstrateSdk with ChangeNotifier {
           _removableOn.toString() +
           '\n' +
           _nextIssuableOn.toString());
-      if (_nextIssuableOn > blocNumber) {
-        final certDelayDuration = (_nextIssuableOn - blocNumber) * 6;
-        _result.putIfAbsent('certDelay', () => certDelayDuration);
-        return _result;
-      } else if (_renewableOn != 0) {
+      if (_renewableOn != 0) {
         final certRenewDuration = (_renewableOn - blocNumber) * 6;
         _result.putIfAbsent('certRenewable', () => certRenewDuration);
         return _result;
+      } else if (_nextIssuableOn > blocNumber) {
+        final certDelayDuration = (_nextIssuableOn - blocNumber) * 6;
+        _result.putIfAbsent('certDelay', () => certDelayDuration);
+        return _result;
       } else {
         _result.putIfAbsent('canCert', () => 0);
         return _result;
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index c5b9c69..74232ad 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -289,7 +289,7 @@ class WalletViewScreen extends StatelessWidget {
                               ),
                             ),
                             Text(
-                              "Vous pourrez renouveller cette certification\ndans \n$_duration",
+                              "Vous pourrez renouveller\ncette certification\ndans $_duration",
                               textAlign: TextAlign.center,
                               style: TextStyle(
                                   fontSize: buttonFontSize - 4,
diff --git a/pubspec.yaml b/pubspec.yaml
index 43fad76..91744eb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -48,7 +48,7 @@ dependencies:
   qr_flutter: #^4.0.0
     git:
       url: https://github.com/insinfo/qr.flutter.git
-      ref: master # branch name
+      ref: master
   responsive_builder: ^0.4.1
   responsive_framework: ^0.2.0
   sentry: ^6.5.1