diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d0a371..5725ae90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# [3.5.1-beta] +20230726 +1. bump sdk 0.5.4+7. +2. acala/karura plugin update. + # [3.5.0-beta] - 20230711 1. bump sdk 0.5.4+5. 2. rename statemine/statemint -> asset hub. diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index fd359852..3589dede 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 = 3503; + CURRENT_PROJECT_VERSION = 3511; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -371,7 +371,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.5.1; 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 = 3503; + CURRENT_PROJECT_VERSION = 3511; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -519,7 +519,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.5.1; 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 = 3503; + CURRENT_PROJECT_VERSION = 3511; DEVELOPMENT_TEAM = WQ5H736A22; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = armv7; @@ -560,7 +560,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - MARKETING_VERSION = 3.5.0; + MARKETING_VERSION = 3.5.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/pages/bridge/bridgePage.dart b/lib/pages/bridge/bridgePage.dart index 75fe5d27..25ee0434 100644 --- a/lib/pages/bridge/bridgePage.dart +++ b/lib/pages/bridge/bridgePage.dart @@ -12,6 +12,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_svg/svg.dart'; +import 'package:polkawallet_plugin_acala/common/constants/index.dart'; +import 'package:polkawallet_plugin_karura/common/constants/index.dart'; import 'package:polkawallet_sdk/api/types/bridge/bridgeChainData.dart'; import 'package:polkawallet_sdk/api/types/bridge/bridgeTokenBalance.dart'; import 'package:polkawallet_sdk/plugin/store/balances.dart'; @@ -597,7 +599,7 @@ class _BridgePageState extends State { MapEntry( v, Image.network( - 'https://resources.acala.network/tokens/$v.png'))) + 'https://resources.acala.network/tokens/${v == acala_stable_coin || v == karura_stable_coin ? 'ASEED' : v}.png'))) : {}; final TokenBalanceData tokenBalance = _config != null diff --git a/lib/pages/walletConnect/wcPairingConfirmPage.dart b/lib/pages/walletConnect/wcPairingConfirmPage.dart index 7cb9111c..c67bc090 100644 --- a/lib/pages/walletConnect/wcPairingConfirmPage.dart +++ b/lib/pages/walletConnect/wcPairingConfirmPage.dart @@ -231,21 +231,25 @@ class WCPairingPermissions extends StatelessWidget { .bodySmall .copyWith(fontWeight: FontWeight.normal), ), - Text( - dic['wc.expiry'], - style: Theme.of(context) - .textTheme - .displaySmall - .copyWith(fontSize: 14), - ), - Text( - Fmt.dateTime( - DateTime.fromMillisecondsSinceEpoch(expiry * 1000)), - style: Theme.of(context) - .textTheme - .bodySmall - .copyWith(fontWeight: FontWeight.normal), - ) + expiry != null + ? Text( + dic['wc.expiry'], + style: Theme.of(context) + .textTheme + .displaySmall + .copyWith(fontSize: 14), + ) + : Container(), + expiry != null + ? Text( + Fmt.dateTime(DateTime.fromMillisecondsSinceEpoch( + expiry * 1000)), + style: Theme.of(context) + .textTheme + .bodySmall + .copyWith(fontWeight: FontWeight.normal), + ) + : Container() ], )) ], diff --git a/lib/pages/walletConnect/wcSessionDetailPage.dart b/lib/pages/walletConnect/wcSessionDetailPage.dart index 1bcddaa7..a6728dd9 100644 --- a/lib/pages/walletConnect/wcSessionDetailPage.dart +++ b/lib/pages/walletConnect/wcSessionDetailPage.dart @@ -82,8 +82,7 @@ class WCSessionDetailPage extends StatelessWidget { ) : Container(), args.version == 2 && session != null - ? WCPairingPermissions( - session.namespaces, session.expiry) + ? WCPairingPermissions(session.namespaces, null) : Container(), Visibility( visible: callRequests.isNotEmpty, diff --git a/lib/utils/format.dart b/lib/utils/format.dart index cc508842..8b76ce52 100644 --- a/lib/utils/format.dart +++ b/lib/utils/format.dart @@ -1,8 +1,11 @@ class AppFmt { static String tokenView(String symbol) { String view = symbol; - if (symbol == 'KUSD' || symbol == 'AUSD') { - view = 'aUSD'; + if (symbol == 'KUSD' || + symbol == 'AUSD' || + symbol == 'aUSD' || + symbol == 'ASEED') { + view = 'aSEED'; } return view; } diff --git a/pubspec.lock b/pubspec.lock index 00f851f4..7263b37d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1147,11 +1147,11 @@ packages: dependency: "direct main" description: path: "." - ref: c67c47f427bb5030a76c9152d9e287409a59b054 - resolved-ref: c67c47f427bb5030a76c9152d9e287409a59b054 + ref: dcb50c9109ad07da48355281a5bef91e103b5cc4 + resolved-ref: dcb50c9109ad07da48355281a5bef91e103b5cc4 url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git" source: git - version: "0.5.3" + version: "0.5.4" polkawallet_plugin_bifrost: dependency: "direct main" description: @@ -1192,11 +1192,11 @@ packages: dependency: "direct main" description: path: "." - ref: a47a35c96ad9bbe7bf25f975891ef9b04bc01d6d - resolved-ref: a47a35c96ad9bbe7bf25f975891ef9b04bc01d6d + ref: "8c28e00da504c293b58215b1199fa3a09f90eabb" + resolved-ref: "8c28e00da504c293b58215b1199fa3a09f90eabb" url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git" source: git - version: "0.5.3" + version: "0.5.4" polkawallet_plugin_kusama: dependency: "direct main" description: @@ -1228,18 +1228,18 @@ packages: dependency: "direct main" description: name: polkawallet_sdk - sha256: "9b59bffebbc95d4e22e046a32ec553d25a2ac67039e23bee31d0395557c0ec63" + sha256: "101a9f943d41edceed0942dc3a54079b0f56490a1cd070ed5bacb6b1e8c6d47c" url: "https://pub.dev" source: hosted - version: "0.5.4+6" + version: "0.5.4+7" polkawallet_ui: dependency: "direct main" description: name: polkawallet_ui - sha256: aa0139cef76996fe053b7de16f6108a471a18f34326c82de4e601e054c33e676 + sha256: "456e09fffd19c0141c221eda7d0827354212ff89dede1a110773b052b2447cf8" url: "https://pub.dev" source: hosted - version: "0.5.4+1" + version: "0.5.4+2" pool: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index ce8ac070..8c28097d 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.0+3503 +version: 3.5.1+3511 environment: sdk: ">=2.10.0 <3.0.0" @@ -55,11 +55,11 @@ dependencies: polkawallet_plugin_acala: git: url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git - ref: c67c47f427bb5030a76c9152d9e287409a59b054 + ref: dcb50c9109ad07da48355281a5bef91e103b5cc4 polkawallet_plugin_karura: git: url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git - ref: a47a35c96ad9bbe7bf25f975891ef9b04bc01d6d + ref: 8c28e00da504c293b58215b1199fa3a09f90eabb polkawallet_plugin_evm: git: url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git @@ -111,8 +111,8 @@ dependency_overrides: # path: ../../coding/polkawallet/polkawallet_plugin_statemine # polkawallet_plugin_evm: # path: ../../coding/polkawallet/polkawallet_plugin_evm - polkawallet_ui: ^0.5.4+1 - polkawallet_sdk: ^0.5.4+6 + polkawallet_ui: ^0.5.4+2 + polkawallet_sdk: ^0.5.4+7 # polkawallet_ui: # path: ../../coding/polkawallet/ui # polkawallet_sdk: