Skip to content
Merged

Realign #3691

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [2.9.4](https://github.com/Superhero-com/superhero-wallet/compare/v2.9.3...v2.9.4) (2026-03-26)


### Features

* **aeternity:** add advance transaction settings ([8455b71](https://github.com/Superhero-com/superhero-wallet/commit/8455b71db749f5d6ad2dc891fc5588c6eb2b8e7d))


### Bug Fixes

* **aeternity:** set custom fee correctly in multiple recipients flow ([7b8eede](https://github.com/Superhero-com/superhero-wallet/commit/7b8eedeab9e7bb50e198696df25fe5aa2b31e97b))
* do not remove pending transaction after 10 minutes ([b75ef88](https://github.com/Superhero-com/superhero-wallet/commit/b75ef88c3e1e86aa0d44f7d5626d1c852b8c911d))
* **infinite-scroll:** only render over actual items ([f34adcd](https://github.com/Superhero-com/superhero-wallet/commit/f34adcdc1bb2d9f71307b027e92a87a8d92b8ea1))
* remove unused locale ([4d0d4b0](https://github.com/Superhero-com/superhero-wallet/commit/4d0d4b0b44c1295e605501a87a8bf4882f933acf))


### Maintenance

* adjust BrowserActions margins ([29cd26a](https://github.com/Superhero-com/superhero-wallet/commit/29cd26aaa866b9188b299067d23f5a81554685f0))
* avoid transaction being removed from pool rapidly ([7018de7](https://github.com/Superhero-com/superhero-wallet/commit/7018de79c3e2503f5a69fff4d2fe66922786aac7))

### [2.9.3](https://github.com/Superhero-com/superhero-wallet/compare/v2.9.2...v2.9.3) (2026-03-16)


Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.superhero.cordova"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 20903
versionName "2.9.3"
versionCode 20904
versionName "2.9.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
abiFilters 'arm64-v8a'
Expand Down
4 changes: 2 additions & 2 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.3;
MARKETING_VERSION = 2.9.4;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = com.superhero.cordova;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -390,7 +390,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.9.3;
MARKETING_VERSION = 2.9.4;
PRODUCT_BUNDLE_IDENTIFIER = com.superhero.cordova;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "superhero-wallet",
"version": "2.9.3",
"version": "2.9.4",
"description": "Superhero wallet",
"author": "Superhero",
"license": "ISC",
Expand Down
1 change: 0 additions & 1 deletion src/popup/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@
"advancedDetails": "Advanced transaction details",
"advancedFeeInvalid": "Enter a valid fee greater than 0.",
"advancedFeeTooLow": "Fee must be at least the estimated minimum fee.",
"advancedFeeLowWarning": "Setting a fee below the estimated minimum may cause this transaction to be rejected or remain pending in the mempool.",
"advancedNonceInvalid": "Enter a valid nonce greater than 0.",
"advancedNonceLowWarning": "Setting a nonce lower than the current account nonce usually leads to rejection unless a transaction with that nonce is still pending in the mempool.",
"advancedNonceReplacementWarning": "A pending transaction with this nonce may be replaced by this new transaction if you continue.",
Expand Down
1 change: 0 additions & 1 deletion src/popup/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@
"advancedDetails": "高级交易详情",
"advancedFeeInvalid": "请输入大于 0 的有效手续费。",
"advancedFeeTooLow": "手续费不能低于预估的最低手续费。",
"advancedFeeLowWarning": "如果手续费低于预估最低值,交易可能会被拒绝,或长时间停留在内存池中等待处理。",
"advancedNonceInvalid": "请输入大于 0 的有效 nonce。",
"advancedNonceLowWarning": "如果 nonce 低于当前账户 nonce,且内存池中没有使用该 nonce 的待处理交易,这笔交易通常会被拒绝。",
"advancedNonceReplacementWarning": "如果内存池中已有使用该 nonce 的待处理交易,继续发送可能会让这笔新交易替换掉原来的待处理交易。",
Expand Down
10 changes: 6 additions & 4 deletions src/protocols/aeternity/components/TransferReview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,8 @@ export default defineComponent({
return;
}

const effectiveTransferData = displayTransferData.value;

if (isActiveAccountAirGap.value && !props.isMultisig) {
emit('success');
return;
Expand All @@ -683,7 +685,7 @@ export default defineComponent({
addresses: recipients,
selectedAsset,
note,
} = props.transferData;
} = effectiveTransferData;

if (!amountRaw || !recipients?.length || !selectedAsset) {
return;
Expand All @@ -704,12 +706,12 @@ export default defineComponent({
});
} else {
let hash;
const customFee = props.transferData.fee
const customFee = effectiveTransferData.fee
? aeToAettos(
new BigNumber(props.transferData.fee).dividedBy(recipients.length || 1),
new BigNumber(effectiveTransferData.fee).dividedBy(recipients.length || 1),
)
: undefined;
let currentNonce = props.transferData.nonce || await fetchCurrentAccountNonce();
let currentNonce = effectiveTransferData.nonce || await fetchCurrentAccountNonce();
// eslint-disable-next-line no-restricted-syntax
for (const recipient of recipients) {
// eslint-disable-next-line no-await-in-loop
Expand Down
Loading