Merge pull request soramitsu#8 from soramitsu/polkaswap-merge

Polkaswap merge

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -25,12 +25,14 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.13.1",
+    "@soramitsu/soraneo-wallet-web": "1.15.4",
     "@walletconnect/web3-provider": "^1.8.0",
     "base-64": "^1.0.0",
     "core-js": "^3.26.0",
+    "country-code-emoji": "^2.3.0",
     "direct-vuex": "^0.12.1",
     "echarts": "^5.4.1",
+    "email-validator": "^2.0.4",
     "ethers": "^5.7.2",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "^3.5.28",
@@ -44,7 +46,7 @@
     "vue-i18n": "^8.11.2",
     "vue-plugin-load-script": "^2.x.x",
     "vue-property-decorator": "^9.1.2",
-    "vue-router": "^3.5.3",
+    "vue-router": "^3.6.5",
     "vuex": "^3.1.3"
   },
   "devDependencies": {

public/adar/template.csv

@@ -1,7 +1,2 @@
-//name, wallet address, usd amount, token symbol
-"Ted Cortez",000000000000000000000000000000000000000000000000,10,val
-"Ted Cortez",000000000000000000000000000000000000000000000000,10,xor
-"Honor Pearce",000000000000000000000000000000000000000000000000,1,pswap
-"Rhianna Carpenter",000000000000000000000000000000000000000000000000,10,xor
-"Ali Odonnell",000000000000000000000000000000000000000000000000,1,val
-"Julian Jenkins",000000000000000000000000000000000000000000000000,1,val
+Melanie Wilson;cnWX1RR9W3iZXtrL5W6WjJoDsWWZHLDCDCMkmWyirHAZJyVu8;2000;XOR
+Charles Scott;cnWX1RR9W3iZXtrL5W6WjJoDsWWZHLDCDCMkmWyirHAZJyVu8;3000;PSWAP

scripts/generateLocaleJson.ts

@@ -1,35 +1,35 @@
-import fs from 'fs'
-import { JSDOM } from 'jsdom'
+import fs from 'fs';
+import { JSDOM } from 'jsdom';
 
 // Mock browser dependencies for imported libraries
-const dom = new JSDOM()
-global.document = dom.window.document as any
-global.window = dom.window as any
-global.localStorage = { getItem: () => {} } as any
+const dom = new JSDOM();
+global.document = dom.window.document as any;
+global.window = dom.window as any;
+global.localStorage = { getItem: () => {} } as any;
 
-function format (obj: any, formatted: any) {
+function format(obj: any, formatted: any) {
   for (const key of Object.keys(obj)) {
-    const value = obj[key]
-    if (typeof (value) === 'string') {
-      formatted[key] = value
+    const value = obj[key];
+    if (typeof value === 'string') {
+      formatted[key] = value;
     } else {
-      formatted[key] = {}
-      format(value, formatted[key])
+      formatted[key] = {};
+      format(value, formatted[key]);
       if (!Object.keys(formatted[key]).length) {
-        delete formatted[key]
+        delete formatted[key];
       }
     }
   }
 }
 
-(async function main () {
-  const buildDir = './src/lang'
+(async function main() {
+  const buildDir = './src/lang';
   if (!fs.existsSync(buildDir)) {
-    fs.mkdirSync(buildDir)
+    fs.mkdirSync(buildDir);
   }
-  const langObj = (await import('../src/lang/messages')).default
-  const formatted = {} as any
-  format(langObj, formatted)
-  fs.writeFileSync(`${buildDir}/en.json`, JSON.stringify(formatted, null, 4))
-  console.log(`${buildDir}/en.json created!`)
-})()
+  const langObj = (await import('../src/lang/messages')).default;
+  const formatted = {} as any;
+  format(langObj, formatted);
+  fs.writeFileSync(`${buildDir}/en.json`, JSON.stringify(formatted, null, 4));
+  console.info(`${buildDir}/en.json created!`);
+})();

src/App.vue

@@ -12,7 +12,7 @@
         <app-logo-button slot="head" class="app-logo--menu" :theme="libraryTheme" @click="goToSwap" />
       </app-menu>
       <div class="app-body" :class="{ 'app-body__about': isAboutPage }">
-        <s-scrollbar class="app-body-scrollbar">
+        <s-scrollbar class="app-body-scrollbar" v-loading="pageLoading">
           <div v-if="blockNumber && !isCurrentPageTooWide" class="block-number">
             <s-tooltip :content="t('blockNumberText')" placement="bottom" tabindex="-1">
               <a class="block-number-link" :href="blockExplorerLink" target="_blank" rel="nofollow noopener">
@@ -98,6 +98,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
   @state.settings.browserNotifPopupVisibility browserNotifPopup!: boolean;
   @state.settings.browserNotifPopupBlockedVisibility browserNotifPopupBlocked!: boolean;
   @state.settings.blockNumber blockNumber!: number;
+  @state.router.loading pageLoading!: boolean;
 
   @getter.wallet.transactions.firstReadyTx firstReadyTransaction!: Nullable<HistoryItem>;
   @getter.wallet.account.isLoggedIn isSoraAccountConnected!: boolean;
@@ -376,7 +377,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
     // console.dir(value);
     // console.groupEnd();
 
-    const message = this.getMessage(value, this.shouldBalanceBeHidden);
+    const message = this.getOperationMessage(value, this.shouldBalanceBeHidden);
     const isNewTx = !oldValue || oldValue.id !== value.id;
     const recipients = this.recipients.filter((item) => item.txId === value.id);