diff --git a/package.json b/package.json index 3c0716120..6ccfd2608 100644 --- a/package.json +++ b/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": { diff --git a/public/adar/template.csv b/public/adar/template.csv index 8be3a71af..0167183a6 100644 --- a/public/adar/template.csv +++ b/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 \ No newline at end of file +Melanie Wilson;cnWX1RR9W3iZXtrL5W6WjJoDsWWZHLDCDCMkmWyirHAZJyVu8;2000;XOR +Charles Scott;cnWX1RR9W3iZXtrL5W6WjJoDsWWZHLDCDCMkmWyirHAZJyVu8;3000;PSWAP diff --git a/public/card/sora-card-front.png b/public/card/sora-card-front.png new file mode 100644 index 000000000..b89dbfeb5 Binary files /dev/null and b/public/card/sora-card-front.png differ diff --git a/public/card/sora-card.png b/public/card/sora-card.png new file mode 100644 index 000000000..595524c09 Binary files /dev/null and b/public/card/sora-card.png differ diff --git a/scripts/generateLocaleJson.ts b/scripts/generateLocaleJson.ts index d26cff61b..0510d20b7 100644 --- a/scripts/generateLocaleJson.ts +++ b/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!`); +})(); diff --git a/src/App.vue b/src/App.vue index 3cf622d03..261b357ce 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,7 +12,7 @@
- +
@@ -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; @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); diff --git a/src/assets/img/sora-card/sora-card-front.svg b/src/assets/img/sora-card/sora-card-front.svg deleted file mode 100644 index 0e6246db5..000000000 --- a/src/assets/img/sora-card/sora-card-front.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/img/sora-card/sora-card.svg b/src/assets/img/sora-card/sora-card.svg deleted file mode 100644 index aa95d2d85..000000000 --- a/src/assets/img/sora-card/sora-card.svg +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/App/Header/AppHeader.vue b/src/components/App/Header/AppHeader.vue index 5c6afac0f..910584264 100644 --- a/src/components/App/Header/AppHeader.vue +++ b/src/components/App/Header/AppHeader.vue @@ -241,9 +241,7 @@ $app-controls-shadow--dark: inset 1px 1px 2px #52523d; margin-left: auto; } - @include desktop { - margin-left: auto; - } + margin-left: auto; &--moonpay { margin-left: auto; diff --git a/src/components/App/Menu/AppMenu.vue b/src/components/App/Menu/AppMenu.vue index 2811e766b..5cbaf68f6 100644 --- a/src/components/App/Menu/AppMenu.vue +++ b/src/components/App/Menu/AppMenu.vue @@ -1,5 +1,13 @@