diff --git a/package.json b/package.json
index 6ccfd2608..9ab4ac60e 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
- "name": "polkaswap-exchange-web",
- "version": "1.15.0",
+ "name": "adar",
+ "version": "0.1.4",
"repository": {
"type": "git",
- "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
+ "url": "https://github.com/soramitsu/adar.git"
},
"license": "Apache-2.0",
"private": true,
diff --git a/public/adar/about/about1.svg b/public/adar/about/about1.svg
new file mode 100644
index 000000000..64a6233ca
--- /dev/null
+++ b/public/adar/about/about1.svg
@@ -0,0 +1,409 @@
+
diff --git a/src/App.vue b/src/App.vue
index 261b357ce..e256db5c2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -69,7 +69,7 @@ import type { ConnectToNodeOptions } from '@/types/nodes';
import type { SubNetwork } from '@/utils/ethers-util';
import type { FeatureFlags } from '@/store/settings/types';
import getters from './store/web3/getters';
-import { RecipientStatus } from './store/routeAssets/types';
+import { RecipientStatus, TransactionInfo } from './store/routeAssets/types';
@Component({
components: {
@@ -360,6 +360,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
@mutation.routeAssets.setRecipientStatus private setRecipientStatus!: any;
@mutation.routeAssets.setRecipientCompleted private setRecipientCompleted!: any;
@getter.wallet.transactions.activeTxs activeTransactions!: Array;
+ @mutation.routeAssets.setTxInfo private setTxInfo!: (txInfo: TransactionInfo) => void;
handleChangeTransactionADAR(value: Nullable, oldValue: Nullable): void {
if (
@@ -390,16 +391,26 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
status: RecipientStatus.FAILED,
});
});
- } else if (value.status === TransactionStatus.InBlock || isNewTx) {
+ } else if (value.status === TransactionStatus.InBlock) {
if (isNewTx) {
+ const { id, blockId, from } = value;
+ this.setTxInfo({ txId: id as string, blockId: blockId as string, from: from as string });
recipients.forEach((reciever) => {
this.setRecipientStatus({
id: reciever.id,
- status: RecipientStatus.SUCCESS,
+ status: RecipientStatus.PASSED,
});
- this.setRecipientCompleted(reciever.id);
+ // this.setRecipientCompleted(reciever.id);
});
}
+ } else if (value.status === TransactionStatus.Finalized) {
+ recipients.forEach((reciever) => {
+ this.setRecipientStatus({
+ id: reciever.id,
+ status: RecipientStatus.SUCCESS,
+ });
+ this.setRecipientCompleted(reciever.id);
+ });
}
// remove active tx on finalized or error status
// this.removeActiveTxs([value.id as string]);
diff --git a/src/components/App/Menu/AppInfoPopper.vue b/src/components/App/Menu/AppInfoPopper.vue
index 6ab1e1187..f4710276d 100644
--- a/src/components/App/Menu/AppInfoPopper.vue
+++ b/src/components/App/Menu/AppInfoPopper.vue
@@ -48,7 +48,8 @@ import { app, SocialNetworkLinks, Links } from '@/consts';
@Component
export default class AppInfoPopper extends Mixins(TranslationMixin, mixins.LoadingMixin) {
- readonly SocialNetworkLinks = SocialNetworkLinks;
+ // readonly SocialNetworkLinks = SocialNetworkLinks;
+ readonly SocialNetworkLinks = [];
readonly app = app;
specVersion: Nullable = null;
@@ -61,18 +62,18 @@ export default class AppInfoPopper extends Mixins(TranslationMixin, mixins.Loadi
get textLinks(): Array<{ title: string; href: string }> {
return [
- {
- title: this.t('helpDialog.privacyPolicy'),
- href: Links.privacy,
- },
+ // {
+ // title: this.t('helpDialog.privacyPolicy'),
+ // href: Links.privacy,
+ // },
{
title: this.t('releaseNotesText'),
href: Links.releaseNotes,
},
- {
- title: this.t('helpDialog.termsOfService'),
- href: Links.terms,
- },
+ // {
+ // title: this.t('helpDialog.termsOfService'),
+ // href: Links.terms,
+ // },
];
}
diff --git a/src/components/App/Menu/AppMenu.vue b/src/components/App/Menu/AppMenu.vue
index 5cbaf68f6..646aa797c 100644
--- a/src/components/App/Menu/AppMenu.vue
+++ b/src/components/App/Menu/AppMenu.vue
@@ -59,10 +59,10 @@
class="el-menu-item menu-item--small"
tabindex="0"
@click.native="openSoraDownloadDialog"
- />
+ /> -->
- -->
+
-
+