Merge branch 'develop'

Author: RomeroYang

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.4.4] - 20220321
+
+* add new property TokenBalanceData.src.
+* add new property plugin.defaultTokens.
+
 ## [0.4.3] - 20220304
 
 * bump polkadot-js/api v7.10.1

lib/plugin/index.dart

@@ -26,6 +26,10 @@ abstract class PolkawalletPlugin implements PolkawalletPluginBase {
   /// for display in Assets page of Polkawallet App.
   final balances = BalancesStore();
 
+  /// Plugin should provide a list of defaultTokens
+  /// for users of Polkawallet App.
+  List<String> get defaultTokens => [];
+
   /// Plugin should provide a list of noneNativeToken
   /// for users of Polkawallet App.
   List<TokenBalanceData> get noneNativeTokensAll => [];
@@ -115,12 +119,12 @@ abstract class PolkawalletPlugin implements PolkawalletPluginBase {
     Keyring keyring, {
     WebViewRunner? webView,
     String? jsCode,
+    Function? socketDisconnectedAction,
   }) async {
-    await sdk.init(
-      keyring,
-      webView: webView,
-      jsCode: jsCode ?? (await loadJSCode()),
-    );
+    await sdk.init(keyring,
+        webView: webView,
+        jsCode: jsCode ?? (await loadJSCode()),
+        socketDisconnectedAction: socketDisconnectedAction);
     await onWillStart(keyring);
   }
 

lib/plugin/store/balances.dart

@@ -43,13 +43,6 @@ abstract class BalancesStoreBase with Store {
       });
     }
 
-    data.removeWhere((e) => e.symbol!.contains('-') && e.amount == '0');
-    data.sort((a, b) => a.symbol!.contains('-')
-        ? 1
-        : b.symbol!.contains('-')
-            ? -1
-            : a.symbol!.compareTo(b.symbol!));
-
     tokens = data;
     isTokensFromCache = isFromCache;
   }
@@ -82,6 +75,7 @@ class TokenBalanceData {
     this.symbol,
     this.type = 'Token',
     this.currencyId,
+    this.src,
     this.minBalance,
     this.fullName,
     this.decimals,
@@ -98,6 +92,7 @@ class TokenBalanceData {
   final String? symbol;
   final String type;
   final Map? currencyId;
+  final Map? src;
   final String? minBalance;
   final String? fullName;
   final int? decimals;

lib/polkawallet_sdk.dart

@@ -24,13 +24,15 @@ class WalletSDK {
     Keyring keyring, {
     WebViewRunner? webView,
     String? jsCode,
+    Function? socketDisconnectedAction,
   }) async {
     final c = Completer();
 
     await _service.init(
       keyring,
       webViewParam: webView,
       jsCode: jsCode,
+      socketDisconnectedAction: socketDisconnectedAction,
       onInitiated: () {
         // inject keyPairs after webView launched
         _service.keyring.injectKeyPairsToWebView(keyring);

lib/service/index.dart

@@ -41,6 +41,7 @@ class SubstrateService {
     WebViewRunner? webViewParam,
     Function? onInitiated,
     String? jsCode,
+    Function? socketDisconnectedAction,
   }) async {
     keyring = ServiceKeyring(this);
     setting = ServiceSetting(this);
@@ -56,6 +57,7 @@ class SubstrateService {
     walletConnect = ServiceWalletConnect(this);
 
     _web = webViewParam ?? WebViewRunner();
-    await _web!.launch(keyring, keyringStorage, onInitiated, jsCode: jsCode);
+    await _web!.launch(keyring, keyringStorage, onInitiated,
+        jsCode: jsCode, socketDisconnectedAction: socketDisconnectedAction);
   }
 }

lib/service/webViewRunner.dart

@@ -28,6 +28,7 @@ class WebViewRunner {
     Keyring keyringStorage,
     Function? onLaunched, {
     String? jsCode,
+    Function? socketDisconnectedAction,
   }) async {
     /// reset state before webView launch or reload
     _msgHandlers = {};
@@ -61,6 +62,10 @@ class WebViewRunner {
               jsCodeStarted = 0;
             }
           }
+          if (message.message.contains("WebSocket is not connected") &&
+              socketDisconnectedAction != null) {
+            socketDisconnectedAction();
+          }
           if (message.messageLevel != ConsoleMessageLevel.LOG) return;
 
           try {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: polkawallet_sdk
 description: Flutter SDK for building plugin package for polkawallet.
-version: 0.4.3
+version: 0.4.4
 homepage: https://polkawallet.io
 
 environment: