Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bridge UI] Use xcm fee in amount calculations #1112

Merged
merged 38 commits into from
Jul 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6c98a9d
fix incoming tracking first steps
Nikita-Polyakov Jul 17, 2023
792f721
improve rococo incomplete transaction tracking
Nikita-Polyakov Jul 17, 2023
679860e
update retry button
Nikita-Polyakov Jul 18, 2023
0921a16
refactoring namings in sub reducer
Nikita-Polyakov Jul 18, 2023
3aa3b91
Merge remote-tracking branch 'origin/develop' into fix/sub-bridge-tra…
Nikita-Polyakov Jul 18, 2023
94d7ca0
return env.json
Nikita-Polyakov Jul 18, 2023
7f8cec2
parachain data tracking
Nikita-Polyakov Jul 18, 2023
152ed50
add sora parachain hash to transaction ui
Nikita-Polyakov Jul 19, 2023
45ee603
improve incoming failed tx tracking
Nikita-Polyakov Jul 19, 2023
235d1e1
merge origin/develop
Nikita-Polyakov Jul 19, 2023
a41fb11
refactor to pass sonar
Nikita-Polyakov Jul 19, 2023
f7a091d
merge origin/develop
Nikita-Polyakov Jul 20, 2023
48fd65a
add block height & blocks left in ui
Nikita-Polyakov Jul 20, 2023
3fef6a7
update wallet 1.18.6
Nikita-Polyakov Jul 20, 2023
9959e0c
refactoring adapter usage
Nikita-Polyakov Jul 20, 2023
3e86fc0
wip adapters usage
Nikita-Polyakov Jul 20, 2023
ed225c2
try to refactor complexity
Nikita-Polyakov Jul 20, 2023
2d902ae
replace adapters in reducer
Nikita-Polyakov Jul 21, 2023
18df623
add beforeSign to bridge reducer
Nikita-Polyakov Jul 21, 2023
412f185
move sora sign to reducers
Nikita-Polyakov Jul 21, 2023
693560b
refactoring signExternal
Nikita-Polyakov Jul 21, 2023
8ebeb76
Merge branch 'tech/improve-sub-adapters-usage' into fix/sub-bridge-tr…
Nikita-Polyakov Jul 21, 2023
43142a1
try to pass sonar
Nikita-Polyakov Jul 21, 2023
1696181
refactoring complexity
Nikita-Polyakov Jul 21, 2023
69413d3
refactoring duplicated code
Nikita-Polyakov Jul 21, 2023
dbe8d90
Merge branch 'develop' into fix/sub-bridge-tracking-fixes
Nikita-Polyakov Jul 24, 2023
257db9c
Merge branch 'develop' into fix/sub-bridge-tracking-fixes
Nikita-Polyakov Jul 24, 2023
0c9c104
merge origin/develop
Nikita-Polyakov Jul 25, 2023
3145f5c
Merge branch 'develop' into fix/sub-bridge-tracking-fixes
Nikita-Polyakov Jul 25, 2023
6068cb5
fix incoming tracking & transfer notification modal
Nikita-Polyakov Jul 25, 2023
4ee5691
add externalTransferFee to store
Nikita-Polyakov Jul 25, 2023
8307d4a
rename evm to external fee
Nikita-Polyakov Jul 26, 2023
2d80268
get transfer fee from const
Nikita-Polyakov Jul 26, 2023
012b557
update bridge main form & logic
Nikita-Polyakov Jul 26, 2023
15d4976
merge origin/develop
Nikita-Polyakov Jul 26, 2023
34f8401
fix bridge formatted fee
Nikita-Polyakov Jul 27, 2023
9e6ab48
native token decimals
Nikita-Polyakov Jul 27, 2023
261566a
revert BridgeInitMixin changes
Nikita-Polyakov Jul 27, 2023
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
Prev Previous commit
Next Next commit
fix incoming tracking & transfer notification modal
  • Loading branch information
Nikita-Polyakov committed Jul 25, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 6068cb53d5c5776e4d7e0d966e679ae13598da20
2 changes: 1 addition & 1 deletion src/components/pages/Bridge/TransferNotification.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<dialog-base :visible.sync="visibility" class="bridge-transfer-notification">
<simple-notification success @close="close">
<simple-notification modal-content success @submit.native.prevent="close">
<template #title>{{ t('bridgeTransferNotification.title') }}</template>
<s-button
v-if="addTokenBtnVisibility"
2 changes: 1 addition & 1 deletion src/components/pages/Moonpay/Notification.vue
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<template #title>
<moonpay-logo :theme="libraryTheme" />
</template>
<simple-notification :success="success" @close="close">
<simple-notification :success="success" @submit.native.prevent="close">
<template #title>{{ title }}</template>
<template #text><div v-html="text" /></template>
</simple-notification>
3 changes: 1 addition & 2 deletions src/utils/bridge/sub/classes/reducers.ts
Original file line number Diff line number Diff line change
@@ -217,7 +217,6 @@ export class SubBridgeIncomingReducer extends SubBridgeReducer {
await this.waitForTransactionBlockId(id);
await this.updateTxSigningData(id);
await this.updateTxExternalData(id);
await this.subNetworkAdapter.stop();
}

private async waitForSoraParachainNonce(id: string): Promise<void> {
@@ -281,7 +280,7 @@ export class SubBridgeIncomingReducer extends SubBridgeReducer {
parachainHash: txId, // parachain tx hash
})
)
.finally(() => this.soraParachainAdapter.stop());
.finally(() => this.closeConnections());
}

const { amount, assetAddress, externalNetwork, payload: prevPayload } = this.getTransaction(id);