update dot denomination

ios/Runner.xcodeproj/project.pbxproj

@@ -396,7 +396,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -531,7 +531,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -561,7 +561,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 0.9.5;
+				MARKETING_VERSION = 0.9.6;
 				PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

lib/common/consts/settings.dart

@@ -129,14 +129,14 @@ const String cross_chain_transfer_address_laminar =
     '5CLaminarAUSDCrossChainTransferxxxxxxxxxxxxxwisu';
 
 /// app versions
-const String app_beta_version = '0.9.5-beta.1';
+const String app_beta_version = '0.9.6-beta.1';
 
 /// js code versions
 const Map<String, int> js_code_version_map = {
-  network_name_polkadot: 9210,
-  network_name_kusama: 9210,
-  network_name_acala_mandala: 9210,
-  network_name_laminar_turbulence: 9210,
+  network_name_polkadot: 9610,
+  network_name_kusama: 9610,
+  network_name_acala_mandala: 9610,
+  network_name_laminar_turbulence: 9610,
 };
 
 /// graphql for laminar

lib/js_service_acala/src/index.js

@@ -83,11 +83,17 @@ async function subscribeMessage(section, method, params, msgChannel) {
   });
 }
 
+async function getNetworkPropoerties() {
+  const chainProperties = await api.rpc.system.properties();
+  return chainProperties;
+}
+
 window.settings = {
   test,
   connect,
   connectAll,
   getNetworkConst,
+  getNetworkPropoerties,
   subscribeMessage,
   genLinks,
 };

lib/js_service_kusama/src/constants/networkSpect.js

@@ -274,3 +274,6 @@ export const NETWORK_LIST = Object.freeze(
 );
 
 export const defaultNetworkKey = SubstrateNetworkKeys.KUSAMA;
+
+export const POLKADOT_GENESIS =
+  "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3";

lib/js_service_kusama/src/index.js

@@ -5,6 +5,7 @@ import staking from "./service/staking";
 import gov from "./service/gov";
 import claim from "./service/claim";
 import { genLinks } from "./utils/config/config";
+import { POLKADOT_GENESIS } from "./constants/networkSpect";
 
 // send message to JSChannel: PolkaWallet
 function send(path, data) {
@@ -93,11 +94,22 @@ async function subscribeMessage(section, method, params, msgChannel) {
   });
 }
 
+async function getNetworkPropoerties() {
+  const chainProperties = await api.rpc.system.properties();
+  return api.genesisHash.toHuman() == POLKADOT_GENESIS
+    ? api.registry.createType("ChainProperties", {
+        ...chainProperties,
+        tokenDecimals: 10,
+      })
+    : chainProperties;
+}
+
 window.settings = {
   test,
   connect,
   connectAll,
   getNetworkConst,
+  getNetworkPropoerties,
   changeEndpoint,
   subscribeMessage,
   genLinks,

lib/js_service_laminar/src/index.js

@@ -88,11 +88,17 @@ async function subscribeMessage(section, method, params, msgChannel) {
   });
 }
 
+async function getNetworkPropoerties() {
+  const chainProperties = await api.rpc.system.properties();
+  return chainProperties;
+}
+
 window.settings = {
   test,
   connect,
   connectAll,
   getNetworkConst,
+  getNetworkPropoerties,
   subscribeMessage,
 };
 

lib/page/account/txConfirmPage.dart

@@ -319,7 +319,7 @@ class _TxConfirmPageState extends State<TxConfirmPage> {
           final bool isPolkadot =
               store.settings.endpoint.info == network_name_polkadot;
           bool isTxPaused = isPolkadot;
-          if (store.gov.bestNumber > 0 &&
+          if (isTxPaused && store.gov.bestNumber > 0 &&
               (store.gov.bestNumber < dot_re_denominate_block - 1200 ||
                   store.gov.bestNumber > dot_re_denominate_block + 1200)) {
             isTxPaused = false;

lib/service/substrateApi/api.dart

@@ -43,8 +43,6 @@ class Api {
   FlutterWebviewPlugin _web;
   int _evalJavascriptUID = 0;
 
-  bool _jsCodeUpdated = false;
-
   Function _connectFunc;
 
   /// preload js code for opening dApps
@@ -234,7 +232,7 @@ class Api {
     // fetch network info
     List<dynamic> info = await Future.wait([
       evalJavascript('settings.getNetworkConst()'),
-      evalJavascript('api.rpc.system.properties()'),
+      evalJavascript('settings.getNetworkPropoerties()'),
       evalJavascript('api.rpc.system.chain()'),
     ]);
     store.settings.setNetworkConst(info[0]);
@@ -243,8 +241,11 @@ class Api {
 
     // fetch account balance
     if (store.account.accountListAll.length > 0) {
-      if (store.settings.endpoint.info == networkEndpointAcala.info ||
-          store.settings.endpoint.info == networkEndpointLaminar.info) {
+      if (store.settings.endpoint.info == networkEndpointAcala.info) {
+        await assets.fetchBalance();
+        return;
+      }
+      if (store.settings.endpoint.info == networkEndpointLaminar.info) {
         laminar.subscribeTokenPrices();
         await assets.fetchBalance();
         return;

pubspec.yaml

@@ -11,7 +11,7 @@ description: PolkaWallet made with Flutter.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.9.5+951
+version: 0.9.6+961
 
 environment:
   sdk: ">=2.1.0 <3.0.0"