Merge pull request #1256 from cypherstack/julian/fixes

Julian/fixes

Author: julian-CStack

lib/app_config.dart

@@ -85,7 +85,10 @@ abstract class AppConfig {
 
     try {
       return coins.firstWhere(
-        (e) => e.identifier.toLowerCase() == name || e.prettyName == prettyName,
+        (e) =>
+            e.identifier.toLowerCase() == name ||
+            e.prettyName == prettyName ||
+            (e is Epiccash && prettyName == "Epic Private Internet Cash"),
       );
     } catch (_) {
       throw Exception("getCryptoCurrencyByPrettyName($prettyName) failed!");

lib/wallets/wallet/wallet_mixin_interfaces/spark_interface.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:isolate';
 import 'dart:math';
@@ -66,7 +67,18 @@ abstract class _SparkIsolate {
   static SendPort? _sendPort;
   static final ReceivePort _receivePort = ReceivePort();
 
+  static Completer<void>? completer;
+
   static Future<void> initialize() async {
+    if (completer != null) {
+      if (!completer!.isCompleted) {
+        await completer!.future;
+      }
+
+      return;
+    }
+    completer = Completer();
+
     final level = Prefs.instance.logLevel;
 
     _isolate = await Isolate.spawn((SendPort sendPort) {
@@ -88,6 +100,7 @@ abstract class _SparkIsolate {
       });
     }, _receivePort.sendPort);
     _sendPort = await _receivePort.first as SendPort;
+    completer!.complete();
   }
 
   static Future<R> run<M, R>(ComputeCallback<M, R> task, M argument) async {