Skip to content

Commit

Permalink
Merge pull request #443 from polkawallet-io/develop
Browse files Browse the repository at this point in the history
3622
  • Loading branch information
RomeroYang authored Mar 27, 2024
2 parents 967453f + 878eee1 commit 62e8a4b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3621;
CURRENT_PROJECT_VERSION = 3622;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand Down Expand Up @@ -500,7 +500,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3621;
CURRENT_PROJECT_VERSION = 3622;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand Down Expand Up @@ -541,7 +541,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3621;
CURRENT_PROJECT_VERSION = 3622;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/assets/transfer/transferPage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class TransferPageState extends State<TransferPage> {
return TxConfirmParams(
txTitle: '${dic['transfer']} $symbol',
module: 'balances',
call: _keepAlive ? 'transferKeepAlive' : 'transfer',
call: _keepAlive ? 'transferKeepAlive' : 'transferAllowDeath',
txDisplayBold: {
dic['to']: Row(
children: [
Expand Down Expand Up @@ -181,7 +181,7 @@ class TransferPageState extends State<TransferPage> {
txParams = TxConfirmParams(
txTitle: '',
module: 'balances',
call: _keepAlive ? 'transferKeepAlive' : 'transfer',
call: _keepAlive ? 'transferKeepAlive' : 'transferAllowDeath',
txDisplay: {},
params: [
widget.service.keyring.allWithContacts[0].address,
Expand Down
16 changes: 8 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1019,8 +1019,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "98afd44f9da52ea073edc54cdfdb83396de10ac0"
resolved-ref: "98afd44f9da52ea073edc54cdfdb83396de10ac0"
ref: "9c88125ae51c102259a7579a5a0a7784c1970dd3"
resolved-ref: "9c88125ae51c102259a7579a5a0a7784c1970dd3"
url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
source: git
version: "0.5.6"
Expand Down Expand Up @@ -1064,17 +1064,17 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "1952901b1e2b3a7f8ac954452be8ea41bb8dabfe"
resolved-ref: "1952901b1e2b3a7f8ac954452be8ea41bb8dabfe"
ref: "7f7c86aa7610baa3aad0863bff676de81978026d"
resolved-ref: "7f7c86aa7610baa3aad0863bff676de81978026d"
url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
source: git
version: "0.5.6"
polkawallet_plugin_kusama:
dependency: "direct main"
description:
path: "."
ref: f67193f9da6aa2a99d9c45cc1f4aa18f9e9cc33b
resolved-ref: f67193f9da6aa2a99d9c45cc1f4aa18f9e9cc33b
ref: f2ff2c916faee504f8271afcb487d87268aee182
resolved-ref: f2ff2c916faee504f8271afcb487d87268aee182
url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
source: git
version: "0.5.2"
Expand Down Expand Up @@ -1108,10 +1108,10 @@ packages:
dependency: "direct main"
description:
name: polkawallet_ui
sha256: "4c8c471bd339346cdf521774b27d72ba6a2e6fc24ab7924755537f0d5923121a"
sha256: "9cbe970586a5bf250c1153b61bac246d3d7dbf7e9ded8382f312a97fb9e3e847"
url: "https://pub.dev"
source: hosted
version: "0.5.5+1"
version: "0.5.5+2"
pool:
dependency: transitive
description:
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.2+3621
version: 3.6.2+3622

environment:
sdk: ">=2.10.0 <3.0.0"
Expand Down Expand Up @@ -51,15 +51,15 @@ dependencies:
polkawallet_plugin_kusama:
git:
url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
ref: f67193f9da6aa2a99d9c45cc1f4aa18f9e9cc33b
ref: f2ff2c916faee504f8271afcb487d87268aee182
polkawallet_plugin_acala:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
ref: 98afd44f9da52ea073edc54cdfdb83396de10ac0
ref: 9c88125ae51c102259a7579a5a0a7784c1970dd3
polkawallet_plugin_karura:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
ref: 1952901b1e2b3a7f8ac954452be8ea41bb8dabfe
ref: 7f7c86aa7610baa3aad0863bff676de81978026d
polkawallet_plugin_evm:
git:
url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
Expand Down Expand Up @@ -111,7 +111,7 @@ dependency_overrides:
# path: ../../coding/polkawallet/polkawallet_plugin_statemine
# polkawallet_plugin_evm:
# path: ../../coding/polkawallet/polkawallet_plugin_evm
polkawallet_ui: ^0.5.5+1
polkawallet_ui: ^0.5.5+2
polkawallet_sdk: ^0.5.9+4
# polkawallet_ui:
# path: ../../coding/polkawallet/ui
Expand Down

0 comments on commit 62e8a4b

Please sign in to comment.