Merge pull request #869 from aeternity/release/0.3.0

Release 0.3.0

Author: mradkov

.env

@@ -1,5 +1,8 @@
 VUE_APP_WALLET_URL=https://wallet.superhero.com
-VUE_APP_JITSI_URL=meet.aepps.com
+VUE_APP_JITSI_HOST=meet.aepps.com
 VUE_APP_BACKEND_URL=https://raendom-backend.z52da5wt.xyz
+VUE_APP_NODE_URL=https://mainnet.aeternity.io
+VUE_APP_EXPLORER_URL=https://mainnet.aeternal.io
+VUE_APP_COMPILER_URL=https://latest.compiler.aepps.com
 VUE_APP_CONTRACT_V1_ADDRESS=ct_2AfnEfCSZCTEkxL5Yoi4Yfq6fF7YapHRaFKDJK3THMXMBspp5z
 VUE_APP_CONTRACT_V2_ADDRESS=

.env.e2e

@@ -1,3 +1,5 @@
-VUE_APP_BACKEND_URL=https://testnet.superhero.aeternity.art
+VUE_APP_BACKEND_URL=https://test-tipping.aeternity.art
+VUE_APP_NODE_URL=https://testnet.aeternity.io
+VUE_APP_EXPLORER_URL=https://testnet.aeternal.io
 VUE_APP_CONTRACT_V1_ADDRESS=ct_2GRP3xp7KWrKtZSnYfdcLnreRWrntWf5aTsxtLqpBHp71EFc3i
 VUE_APP_CONTRACT_V2_ADDRESS=

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "superhero-ui",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -16,22 +16,21 @@
   },
   "license": "ISC",
   "dependencies": {
-    "tipping-contract": "github:aeternity/tipping-contract#develop",
-    "aeternity-fungible-token": "github:mradkov/aeternity-fungible-token",
     "@aeternity/aepp-sdk": "^7.7.0",
-    "@aeternity/superhero-button": "^0.1.3",
     "@dicebear/avatars": "^4.2.5",
     "@dicebear/avatars-avataaars-sprites": "^4.2.5",
+    "aeternity-fungible-token": "github:mradkov/aeternity-fungible-token",
     "autosize": "^4.0.2",
     "axios": "^0.19.0",
     "bignumber.js": "^9.0.0",
     "bootstrap": "^4.5.2",
     "core-js": "^3.6.5",
-    "detect-browser": "^4.8.0",
     "i18n": "^0.8.6",
     "jdenticon": "^2.2.0",
     "jitsi-iframe-api": "^1.0.0",
     "lodash-es": "^4.17.15",
+    "soundcloud-widget": "^0.2.1",
+    "tipping-contract": "github:aeternity/tipping-contract#develop",
     "vue": "^2.6.12",
     "vue-i18n": "^8.21.1",
     "vue-router": "^3.4.5",

package.json

@@ -1,11 +1,5 @@
 <template>
   <div id="app">
-    <div
-      v-if="isSupportedBrowser"
-      class="supportedbrowser--alert"
-    >
-      {{ $t('noExtensionSupport') }}
-    </div>
     <MobileNavigation v-if="!$route.meta.fullScreen" />
     <div class="not-bootstrap-row">
       <div
@@ -33,13 +27,10 @@
 
 <script>
 import { mapMutations, mapState, mapGetters } from 'vuex';
-import { detect } from 'detect-browser';
-import {
-  client, initClient, scanForWallets, tokenBalance,
-} from './utils/aeternity';
+import { initSdk, scanForWallets, tokenBalance } from './utils/aeternity';
 import Backend from './utils/backend';
 import { EventBus } from './utils/eventBus';
-import { IS_MOBILE_DEVICE, supportedBrowsers, atomsToAe } from './utils';
+import { atomsToAe } from './utils';
 import MobileNavigation from './components/layout/MobileNavigation.vue';
 import LeftSection from './components/layout/LeftSection.vue';
 import RightSection from './components/layout/RightSection.vue';
@@ -48,31 +39,28 @@ export default {
   components: { MobileNavigation, LeftSection, RightSection },
   computed: {
     ...mapGetters('modals', ['opened']),
-    ...mapState(['address']),
-    isSupportedBrowser() {
-      const browser = detect();
-      return !IS_MOBILE_DEVICE && (browser && !supportedBrowsers.includes(browser.name));
-    },
+    ...mapState(['address', 'sdk']),
   },
   async created() {
     EventBus.$on('reloadData', () => {
       this.reloadData();
     });
     setInterval(() => this.reloadData(), 120 * 1000);
-    EventBus.$on('backendError', () => this.$route.name !== 'maintenance' && this.$router.push({
-      name: 'maintenance',
-    }).catch((err) => { console.error(err); }));
-    await this.initialLoad();
+
+    await initSdk();
+    await Promise.all([
+      this.initWallet(),
+      this.reloadData(),
+    ]);
   },
   methods: {
     ...mapMutations([
-      'setLoggedInAccount', 'updateTopics', 'updateCurrencyRates',
-      'setOracleState', 'addLoading', 'removeLoading', 'setChainNames', 'updateBalance',
+      'setAddress', 'updateTopics', 'updateCurrencyRates',
+      'setOracleState', 'setChainNames', 'updateBalance',
       'setGraylistedUrls', 'setTokenInfo', 'setVerifiedUrls', 'useSdkWallet', 'addTokenBalance',
       'setPinnedItems',
     ]),
     async reloadData() {
-      // await fetch
       const [
         chainNames, oracleState, topics, verifiedUrls, graylistedUrls, tokenInfo,
       ] = await Promise.all([
@@ -84,62 +72,42 @@ export default {
         Backend.getTokenInfo(),
         this.$store.dispatch('backend/reloadStats'),
         this.$store.dispatch('backend/reloadPrices'),
+        this.reloadUserData(),
       ]);
 
-      if (this.address) {
-        const balance = await client.balance(this.address).catch(() => 0);
-        this.updateBalance(atomsToAe(balance).toFixed(2));
-      }
-
-      // async fetch
       this.updateTopics(topics);
       this.setChainNames(chainNames);
       this.setOracleState(oracleState);
       this.setGraylistedUrls(graylistedUrls);
       this.setVerifiedUrls(verifiedUrls);
       this.setTokenInfo(tokenInfo);
-      if (this.address) this.loadTokenBalances(this.address);
     },
-    async fetchUserData() {
+    async reloadUserData() {
+      if (!this.address) return;
       await Promise.all([
         this.$store.dispatch('updatePinnedItems'),
         this.$store.dispatch('updateUserProfile'),
+        (async () => {
+          const balance = await this.sdk.balance(this.address).catch(() => 0);
+          this.updateBalance(atomsToAe(balance).toFixed(2));
+        })(),
+        (async () => {
+          const tokens = await Backend.getTokenBalances(this.address);
+          await Promise.all(Object.entries(tokens).map(async ([token]) => this
+            .addTokenBalance({ token, balance: await tokenBalance(token, this.address) })));
+        })(),
       ]);
     },
-    async initialLoad() {
-      this.addLoading('initial');
-      this.addLoading('wallet');
-      await initClient();
-      await this.reloadData();
-      this.removeLoading('initial');
-      if (this.address) {
-        this.removeLoading('wallet');
-        this.fetchUserData();
-      }
-
+    async initWallet() {
       let { address } = this.$route.query;
       if (!address) {
-        await scanForWallets();
-        address = client.rpcClient.getCurrentAccount();
+        address = await scanForWallets();
         console.log('found wallet');
         this.useSdkWallet();
+        this.$store.dispatch('updateCookiesConsent', address);
       }
-      const balance = await client.balance(address).catch(() => 0);
-      this.setLoggedInAccount({
-        address,
-        balance: atomsToAe(balance).toFixed(2),
-      });
-
-      // trigger run async in background
-      this.loadTokenBalances(address);
-
-      this.fetchUserData();
-      this.removeLoading('wallet');
-    },
-    async loadTokenBalances(address) {
-      const tokens = await Backend.getTokenBalances(address);
-      await Promise.all(Object.entries(tokens).map(async ([token]) => this
-        .addTokenBalance({ token, balance: await tokenBalance(token, address) })));
+      this.setAddress(address);
+      await this.reloadUserData();
     },
   },
 };
@@ -178,11 +146,6 @@ export default {
   display: flex;
   flex-direction: column;
 
-  .supportedbrowser--alert {
-    text-align: center;
-    line-height: 3rem;
-  }
-
   .not-bootstrap-row {
     flex-grow: 1;
     display: flex;