From 7fd4772121b171cdfb3ae67fe4107dc228327cae Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Fri, 17 Sep 2021 11:14:17 +0300
Subject: [PATCH] CAKE-356 | fixed _fetchEmojiFromUri method in the main.dart
 and fetchYatAddress method in the yat_record.dart

---
 lib/main.dart           | 4 ++--
 lib/yat/yat_record.dart | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index a1ada2923..e71a6c198 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -228,11 +228,11 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
 
   void _fetchEmojiFromUri(Uri uri, YatStore yatStore) {
     final queryParameters = uri.queryParameters;
-    if (queryParameters == null || queryParameters.isEmpty) {
+    if (queryParameters?.isEmpty ?? true) {
       return;
     }
     final emoji = queryParameters['eid'];
-    if (emoji == null || emoji.isEmpty) {
+    if (emoji?.isEmpty ?? true) {
       return;
     }
     yatStore.emoji = emoji;
diff --git a/lib/yat/yat_record.dart b/lib/yat/yat_record.dart
index 4a0bf84a3..8173d99ae 100644
--- a/lib/yat/yat_record.dart
+++ b/lib/yat/yat_record.dart
@@ -20,5 +20,10 @@ Future<String> fetchYatAddress(String emojiId, String ticker) async {
   }
 
   final yatAddress = result.first['data'] as String;
+
+  if (yatAddress?.isEmpty ?? true) {
+    return '';
+  }
+
   return yatAddress;
 }
\ No newline at end of file