diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3ee68984..255fba25 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -128,11 +128,15 @@ jobs: - name: Rename file run: mv ${{steps.sign_app.outputs.signedReleaseFile}} dist/cordova/android/apk/release/Sync2-android-${{ steps.vars.outputs.tag }}.apk + - name: Calculate checksum of output file + run: shasum -a 512 dist/cordova/android/apk/release/Sync2-android-${{ steps.vars.outputs.tag }}.apk | cut -f1 -d\ | xxd -r -p | base64 > dist/cordova/android/apk/release/Sync2-android-${{ steps.vars.outputs.tag }}-apk-SHASUM + - name: Upload released files uses: softprops/action-gh-release@v1 with: draft: true files: | dist/cordova/android/apk/release/Sync2-android-${{ steps.vars.outputs.tag }}.apk + dist/cordova/android/apk/release/Sync2-android-${{ steps.vars.outputs.tag }}-apk-SHASUM env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package-lock.json b/package-lock.json index 25b820fc..598218d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "org.vechain.sync2", - "version": "2.0.3", + "version": "2.0.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9dc9d24a..99f193f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "org.vechain.sync2", - "version": "2.0.4", + "version": "2.0.5", "description": "VeChain Sync2", "productName": "Sync2", "cordovaId": "org.vechain.sync2", diff --git a/src/i18n/en-us/index.ts b/src/i18n/en-us/index.ts index eb3d9ffb..5e3794c3 100644 --- a/src/i18n/en-us/index.ts +++ b/src/i18n/en-us/index.ts @@ -179,6 +179,7 @@ export default { msg_invalid_request: 'Invalid request', msg_fetch_request_failed: 'Unable to fetch request content', msg_request_hash_mismatch: 'CAUTION: the request content is corrupted or tampered', + msg_fee_delegation: 'Fee will be paid by dApp', // sign success title_success: 'Success', diff --git a/src/i18n/zh-cn/index.ts b/src/i18n/zh-cn/index.ts index 06a93e9b..a74f7073 100644 --- a/src/i18n/zh-cn/index.ts +++ b/src/i18n/zh-cn/index.ts @@ -178,6 +178,7 @@ export default { msg_invalid_request: '无效请求', msg_fetch_request_failed: '无法获取请求内容', msg_request_hash_mismatch: '注意: 请求内容已损坏或者被篡改', + msg_fee_delegation: '费用由应用支付', // sign success title_success: '成功', diff --git a/src/pages/Sign/GasFeeBar.vue b/src/pages/Sign/GasFeeBar.vue index 3ab52d67..d1ab5a88 100644 --- a/src/pages/Sign/GasFeeBar.vue +++ b/src/pages/Sign/GasFeeBar.vue @@ -17,6 +17,7 @@ + {{$t('sign.msg_fee_delegation')}} @@ -33,7 +34,8 @@ import AmountLabel from 'src/components/AmountLabel.vue' export default Vue.extend({ components: { AmountLabel }, props: { - fee: String + fee: String, + isDelegation: Boolean } }) diff --git a/src/pages/Sign/TxDialog.vue b/src/pages/Sign/TxDialog.vue index 9397a00a..8cd58a68 100644 --- a/src/pages/Sign/TxDialog.vue +++ b/src/pages/Sign/TxDialog.vue @@ -40,7 +40,7 @@ @click="showWarnings()" /> - + { const est = this.estimation const fee = this.fee - if (!est || !fee) { + if (!est || !fee || (this.req.options.delegator && !this.req.options.delegator.signer)) { return null } const signer = this.signer