From a43cb8134801a13bed3b399d1daef359c5a2d510 Mon Sep 17 00:00:00 2001 From: shawn Date: Tue, 9 Jan 2024 12:44:08 +0800 Subject: [PATCH 1/3] bump polkawallet_sdk: 0.5.8+2 --- pubspec.lock | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index b3d48db7..2b459790 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1100,10 +1100,10 @@ packages: dependency: "direct main" description: name: polkawallet_sdk - sha256: "59c0fb0314d0bce37cbab2b3e4fd23d840bc8428732982f442930dc60f3060d1" + sha256: a43cc3b289f13ed81357b7b57df76a9a40793c5549c8edce14d4c6892ce5bc15 url: "https://pub.dev" source: hosted - version: "0.5.8+1" + version: "0.5.8+2" polkawallet_ui: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index f0a084ee..dc00351d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -112,7 +112,7 @@ dependency_overrides: # polkawallet_plugin_evm: # path: ../../coding/polkawallet/polkawallet_plugin_evm polkawallet_ui: ^0.5.5+1 - polkawallet_sdk: ^0.5.8+1 + polkawallet_sdk: ^0.5.8+2 # polkawallet_ui: # path: ../../coding/polkawallet/ui # polkawallet_sdk: From df24c466d483907588e551e5a2a9455f742c72c5 Mon Sep 17 00:00:00 2001 From: shawn Date: Wed, 10 Jan 2024 17:06:13 +0800 Subject: [PATCH 2/3] fix browserSearch input with space --- lib/pages/browser/browserSearch.dart | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/pages/browser/browserSearch.dart b/lib/pages/browser/browserSearch.dart index 625b1cfd..0fc5788b 100644 --- a/lib/pages/browser/browserSearch.dart +++ b/lib/pages/browser/browserSearch.dart @@ -63,23 +63,24 @@ class SearchBarDelegate extends SearchDelegate { @override Widget buildResults(BuildContext context) { - BrowserApi.addDappSearchHistory(service, query); + final input = query.trim(); + BrowserApi.addDappSearchHistory(service, input); var dapps = service.store.settings.dapps; - if (query.trim().isNotEmpty) { + if (input.isNotEmpty) { List _dapps = []; dapps.forEach((element) { - if (element['name'].contains(query)) { - element['nameIndex'] = element['name'].indexOf(query); + if (element['name'].contains(input)) { + element['nameIndex'] = element['name'].indexOf(input); _dapps.add(element); - } else if (element['detailUrl'].contains(query)) { - element['detailIndex'] = element['detailUrl'].indexOf(query); + } else if (element['detailUrl'].contains(input)) { + element['detailIndex'] = element['detailUrl'].indexOf(input); _dapps.add(element); } }); dapps = _dapps; } - if (dapps.length == 0 && query.trim().length > 0) { - final url = query.startsWith("http") ? query : "https://$query"; + if (dapps.isEmpty && input.isNotEmpty) { + final url = input.startsWith("http") ? input : "https://$input"; Future.delayed(Duration.zero, () { BrowserApi.openBrowser(context, {"detailUrl": url}, service); }); From 0b8746ca7ee6ae2c38226eda593f59f6d874b2a0 Mon Sep 17 00:00:00 2001 From: shawn Date: Fri, 12 Jan 2024 11:52:33 +0800 Subject: [PATCH 3/3] release 3601 --- CHANGELOG.md | 5 +++++ ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/common/consts.dart | 2 +- lib/service/walletApi.dart | 5 ++--- pubspec.lock | 4 ++-- pubspec.yaml | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fd9ca81..60ee703c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# [3.6.0-beta] +20240112 +1. update DApp browser. +2. bridge add statemint support. + # [3.5.9-beta] 20231229 1. update acala/karura plugin to fix ios crash. diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d4a16df8..c5228128 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -352,7 +352,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3591; + CURRENT_PROJECT_VERSION = 3601; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -371,7 +371,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.9; + MARKETING_VERSION = 3.6.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -500,7 +500,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3591; + CURRENT_PROJECT_VERSION = 3601; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -519,7 +519,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.9; + MARKETING_VERSION = 3.6.0; PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -541,7 +541,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 3591; + CURRENT_PROJECT_VERSION = 3601; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -560,7 +560,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.9; + MARKETING_VERSION = 3.6.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/common/consts.dart b/lib/common/consts.dart index 04a7dc90..6a5ed591 100644 --- a/lib/common/consts.dart +++ b/lib/common/consts.dart @@ -66,7 +66,7 @@ const bridge_account = { 'acala': '13YMK2eYoAvStnzReuxBjMrAvPXmmdsURwZvc62PrdXimbNy' }; -const bridge_sdk_version = 35701; +const bridge_sdk_version = 36001; const show_guide_status_key = 'show_guide_status'; diff --git a/lib/service/walletApi.dart b/lib/service/walletApi.dart index 08476210..f580616f 100644 --- a/lib/service/walletApi.dart +++ b/lib/service/walletApi.dart @@ -336,9 +336,8 @@ class WalletApi { } static Future getEthConfig() async { - //TODO: - // const url = '$_configEndpoint/config/ethConfig.json'; - const url = '$_endpoint/devConfiguration/config/ethConfig.json'; //dev + const url = '$_configEndpoint/config/ethConfig.json'; + // const url = '$_endpoint/devConfiguration/config/ethConfig.json'; //dev try { final res = await get(Uri.parse(url)).timeout(const Duration(seconds: 3)); return jsonDecode(utf8.decode(res.bodyBytes)); diff --git a/pubspec.lock b/pubspec.lock index 2b459790..138568a8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1100,10 +1100,10 @@ packages: dependency: "direct main" description: name: polkawallet_sdk - sha256: a43cc3b289f13ed81357b7b57df76a9a40793c5549c8edce14d4c6892ce5bc15 + sha256: "1f6ff555636a7d0c29f5d5e9eeac29df340a201d67c4fc391c455feb67f7b928" url: "https://pub.dev" source: hosted - version: "0.5.8+2" + version: "0.5.8+4" polkawallet_ui: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index dc00351d..679df8b5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 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: 3.5.9+3591 +version: 3.6.0+3601 environment: sdk: ">=2.10.0 <3.0.0" @@ -112,7 +112,7 @@ dependency_overrides: # polkawallet_plugin_evm: # path: ../../coding/polkawallet/polkawallet_plugin_evm polkawallet_ui: ^0.5.5+1 - polkawallet_sdk: ^0.5.8+2 + polkawallet_sdk: ^0.5.8+4 # polkawallet_ui: # path: ../../coding/polkawallet/ui # polkawallet_sdk: