Skip to content

Commit

Permalink
Release 1.10 fixes (#855)
Browse files Browse the repository at this point in the history 
* Show expected address message when eth part not signed (#629)

* show expected address message when eth part not signed

* update wallet to 1.8.0

* Fix/bridge history eth timestamp (#630)

* fetch eth timestamp from block

* fetch sora start timestamp

* refactoring after review

* update wallet

* Fix/pw 607 (#631)

* fix asset check for adding liquidity

* bridge - remove message from pending state

* QR code support (#632)

* update wallet version

* update translations

* fix ru swap translations

* update wallet to 1.8.5 (#633)

* Crowdloan rewards (#634)

* update amount table

* update translations

* update types

* Feature/pw 593 (#635)

* add addToken function

* add SimpleNotification component

* add transfer notification component

* update transfer notification modal

* update translations

* remove unused code

* update wallet to 1.8.6

* update de translation

* update wallet to 1.8.7 (#640)

* update wallet to 1.8.8 (#641)

* Tech/update swap send translations (#645)

* update translations

* fix swap send direction

* PW-592: Loading on token select (#646)

* Added button loading on token select.

* update wallet to 1.8.11 (#648)

* Referrals list: Added pagination. (#651)

* Vuex improvements (#649)

* tmp

* Add vuex modules

* Add decorators

* Improve vuex usage & fix minor issues

* Fix issues

* Improve module names

* Fix issues

* Update package.json

* Update mutations.ts

* Update TokenSelectMixin.ts

* Update Swap.vue

* Update ConfirmSwap.vue

* Fix issues

* Refactor referral system

* Refactor confirm token pair dialog

* Remove useless await

* Remove useless string casting for slippage

* Add missed modifiers

* Restructure imports and readonly props order

* Add missed types

* Add missed modifiers

* Fix typescript issues

* Update RemoveLiquidityTransactionDetails.vue

* Add null checks for referral system & fix issue with navigation

* Update Pool.vue

* Fix add liquidity inputs issue

* Fix add liquidity focused field logic

it wasn't work in the previous implementation, so, it was needed to fix it or just ignore that logic. I decided to fix it

* Add missed modifiers

* Fix remove liquidity

* Fix remove liquidity issues

* Remove useless check from Pool component

* Update TransferNotification.vue

* Update wallet version

* Add automatically all selected tokens for Bridge to SORA side

* Fix namings

* Update PR

* Update wallet version

* Update wallet version

* Fix types

* Update referral system storage

* Update referral program component

* Fix copy feature

* Update ReferralProgram.vue

* Update ReferralProgram.vue

* Fix typo

* Fix referral program info line values (#655)

* Fix referral program info line values

* Update SelectNode.vue

* Fix same issues

* Update yarn.lock

* Fix swap tx details issue (#658)

* update wallet & wait for liquidity subscriptions creation (#659)

* Bridge: remove redundant message, fix confirmation message for evm part (#660)

* remove redundant message, fix confirmation message for evm part

* remove redundant translation key wait30Block

* Feature/pw 621 (#647)

* use AssetList in SelectToken & SelectRegisteredAsset

* create SelectAssetList common component

* add SearchInput component

* use components from wallet

* select asset dialogs refactoring

* fix naming

* fix ts error

* show total tooltip for crowdloan rewards (#662)

* PW-625: Add new languages (#656)

* Added new languages, updated translation.

* Mobile Download app (#657)

* prework

* change styles

* change google play link

* add example

* refactoring

* update vue config

* remove unused code

* transform svg

* fix svg patterns

* Update sora-app-right.svg

* add new languages

Co-authored-by: Nikita-Polyakov <[email protected]>

* bridge tx restoration improvements (#663)

* bridge tx restoration improvements

* fix ternary condition

Co-authored-by: Stefan Popov <[email protected]>

* Update Rewards view to use subscriptions & fix crowdloan rewards (#665)

* wip subscriptions

* update rewards to subscriptions

* fix subscription calls

Co-authored-by: Stefan Popov <[email protected]>

* subquery, meta, whitelist improvements (#666)

* Add subquery endpoint

* Fix twitter meta img

* Update whitelist.json

* Update App.vue

* Update translations

Co-authored-by: Nikita Polyakov <[email protected]>

* NFT preview & token-logo refactoring (#664)

* prework

* refactor

* Update PairTokenLogo.vue

Co-authored-by: Stefan Popov <[email protected]>

* improve webpack config (#667)

* subscription creation fix & unicode-loader fix (#669)

* Fix meta, token logo & referral fiat (#668)

* Fix token logo

* Fix meta

* Fix fiat values for referral program

* Update package.json

* Update AppHeader.vue

* Update SelectToken.vue

* update ru translation

* Update yarn.lock

* update languages

Co-authored-by: RustemYuzlibaev <[email protected]>

* add data test attribute

* Fix metamask token logo (#673)

* PW-665: Add Referrer Subscription (#675)

* Added referrer subscription.
* Updated translation.
* Added some translation.

* change data-test-atr for pools

* update wallet to 1.8.23 (#681)

* update wallet to 1.8.23

* Add node

Co-authored-by: Stefan Popov <[email protected]>

* remove xor crowdloan rewards (#687)

* Fix network chain genesis hash update (#674)

* do not reset existing genesis hash

* refactoring unsubscribe calls

* add method to actions

* refactoring unsubscribe

* PW-649: Add copy feature for bridge accounts (#695)

* Bridge: Added Networks Copy Functionality.

* fix timestamp sent to etherscan (#694)

* Select extension (#696)

* update types

* update wallet to 1.9.1

* Add release notes link (#697)

* add translations

* refactoring text links

* ReferralSystem: Insufficient Bonded Amount Fix (#698)

* ReferralSystem: Insufficient Bonded Amount Fix.

* [PW-670] Provide environment variables for tst and dev stands on Polkaswap

* [PW-670] Provide environment variables for tst and dev stands on Polkaswap

* add plugin & adjust config (#672)

Co-authored-by: Nikita Polyakov <[email protected]>

* enable NFT tab & add languages (#701)

* add Sonar

* Charts: Added Charts Enabled Settings. (#708)

* PW-650: Refactor Tooltips/Notifications For Copy Address Operation (#703)

* Refactored Copy Address Functionality.
* Updated Translation.
* Increased wallet version.

* Wallet 1.9.8 (#709)

* update wallet to 1.9.7

* wallet 1.9.8

* change env var (#710)

* loop through the node list (#711)

* add copy static

* add translations (#712)

* add translations

* add 2 translations

* Feature/pw 679 (#705)

* create demeter store

* add PoolStatusBadge component

* wip pool card

* show/hide badge in title

* update translations & info lines

* add dialog templates

* stake dialog content

* fix percent css

* fix ts error

* subscriptions examples

* update store

* claim dialog wip

* add AccountPoolMixin

* buttons texts

* add claim rewards action

* fix claim handler

* add staking route

* wip Staking page

* connect wallet on card

* add PageMixin

* refactoring common methods

* add staking actions

* add DemeterDataContainer

* new folder structure

* remove liqudity calculations

* add APR for staking

* fix apr formula

* add liquidty apr

* update calc

* refactoring params

* hide removed inactive pools

* fix calculations after

* add float input for stake

* add fiat amounts to stake dialog

* refactoring balance

* fix pool share after

* update translation keys

* fix some translations, max button visibility

* update removeLiquidity

* update messages

* update translations

* revert env.json

* staking empty card

* fix status-badge css

* update icon & balance text

* update badges

* fix click on stopped pool badge

* fix bugs

* fixes after review

* up wallet (#717)

* test

* remove test values

* test

* revert values

* add stage deploy

* fix rewards list after claim (#725)

* fix calc for availableFunds (#724)

* move textLinks to computed (#723)

* remove initial sync with metamask on page loading (#726)

* add demeter link (#727)

* update wallet to 1.10.0 (#731)

* Upgrade to Metadata 14 (#732)

* Fix migration issues

* Update imports

* Fix JSON.parse

* tmp

* Fix issues

* Up wallet version

* PW-686: Charts - Add Chart for 1 Token (XYK Pool) (#719)

* Added Chart For One Token Draft.

* Updated charts.

* load new data, price change

* chart for double tokens

* Updated styles and responsive behaviour.

* chart for 2 tokens fixes (#733)

* move @vue/composition-api to devDependencies

* add echarts plugin

Co-authored-by: alexnatalia <[email protected]>
Co-authored-by: Nikita-Polyakov <[email protected]>
Co-authored-by: Nikita Polyakov <[email protected]>

* [Line Chart]: Add Filtering by Time (#734)

* Added Chart For One Token Draft.

* Updated charts.

* load new data, price change

* chart for double tokens

* Updated styles and responsive behaviour.

* chart for 2 tokens fixes (#733)

* zoom chart and fetch data

* line chart filters

* add candle filters

* fix timeFormat

* set line chart grid option

* refactoring

* remove merge artifacts

Co-authored-by: alexnatalia <[email protected]>

* chart theme colors (#736)

* add candle chart filters (#737)

* PW-687: Charts - Add Dark Theme (#735)

* Charts: Updated Dark theme.

* Update chart specs & rendering (#738)

* update specs, precision for value

* token logos

* token logos

* Update deps (#739)

* Swap Chart refactorng & fix rendering issues (#740)

* add ThemePaletteMixin

* move components to swap folder

* rendering fixes

* revert env.json

* fix tabs

* return any types temporary

* Update env.json (#744)

* Update wallet to 1.10.3 (#745)

* update wallet to 1.10.3

* update wallet to 1.10.4

* update translations from localise

* update translations

* Fix router warning (#746)

* Fix router warning

* Update wallet

* Charts Skeleton (#741)

* Charts: Added Skeleton for Loading and Error States.

* Add scan QR feature (#747)

* update wallet to 1.10.6 & refactoring

* update translations

* fix remove liquidity with locked tokens (#748)

* Fixed Receive Misspelling. (#750)

* bridge confirm loading state (#751)

* fix loading historical prices (#755)

* Modify Tokens page (#743)

* add price column

* add data to table

* fetch fix

* improve table components

* add ethereumAddress

* fix registered assets fetch

* sticky column

* scrollable table

* style & ui fixes

* fix price change format

* fix prettier warning

* APR Calculator (#754)

* merge b50b4a7

* refactoring AddLiquidity input fields

* update StakeDialog

* pass balance to TokenInput

* merge 07bcac7

* update Swap

* update ReferralBonding

* merge f50f6ce

* merge c55e6eb

* add demeter copyright

* fix ts erros

* update translations

* add TranslationConsts

* add ~ sign to rewards

* Update dev config (#758)

* remove CreatePair view (#757)

* fix ROI (#759)

* Remove whitelist.json (#761)

* Remove whitelist.json

* Update wallet

* fix fetchHistoryElements ts errors

Co-authored-by: Nikita-Polyakov <[email protected]>

* local browser notification (#752)

* prework

* add notification modals

* refactor & change watcher source

* refactor

* Update en.json

* fix translation nesting

* translation fixes

* translations

* add bell icon

* add svg icon

* add missing translations

* fixes

* upd translations

* delete space between comma

* PW-747: Fix Responsive Behaviour and OX Axis Formatting (#760)

* Fixed Responsive Design Issues (skeleton width, filters position, breakpoints)

* Feature/pw 755 (#765)

* wip axis labels

* wip label interval setting

* polling new prices

* fix bugs

* format labels

* fix overlapping

* add beforeDestroy hook

* return LT format for hours

* add no data message

* reduce hour filter items count

* Update Jenkinsfile

refactor

* Update QR scan UI with select input (#768)

* update wallet to 1.10.13

* remove NotificationEnablingPage

* update wallet to 1.10.14

* add MAX buttons to farming and remove liquidity (#769)

* add copyFile

* test

* revert test values

* fix chart data fetching (#771)

* Save selected token in state manager (#772)

* update swap page

* update Bridge page

* remove unused imports

* fix typo

* up app-menu z-index for fix token page table

* update port regexp

* add layers as scss variables

* add newline

* clear addLiqudity selected token on destroyed (#773)

* Fix bridge issues (#776)

* Fix bridge issues

* Update deps

* update wallet to 1.10.15 (#775)

* fix getEvmNetworkType (#777)

* add checks (#778)

* Create generateNftServiceKeypair.js

* add dep

* PW-733: Activity Should Have First/Last Page Buttons (#774)

* Bridge and MoonPay History: Added First and Last pagination buttons.

* Consts Code Duplication Refactoring (#780)

* Refactored Consts Code Duplication.

* Bridge, Moonpay History: Added Pagination Page State.

Co-authored-by: alexnatalia <[email protected]>

* write to file

* add ipfs hash notif

* refactor

* provide README

* Update README.md

* fix styling

* Update README.md

* Update README.md

* revert test changes

* use UCAN tokens for NFT marketplace (#779)

* Create generateNftServiceKeypair.js

* add dep

* write to file

* provide README

* Update README.md

* fix styling

* Update README.md

* Update README.md

* use iife

* add ucan jenkinsfile

* fix var

* add api key, fix dependency install

* test env var

* test

* test2

* test3

* test4

* debug

* remove debug steps

* get token

* test api key

* use explicit

* remove debug step

* test error notif

* add registering & change path

* fix path

* debug

* fix output file name

* fix path

* remove path

* test

* refactor

* refactor

* test

* test

* debug

* debug

* debug

* debug

* debug

* debug

* debug

* Update generateNftServiceKeypair.js

* Delete ucan.json

* fix secret scaner alert

* debug

* revert

* debug

* refactor

* debug

* refactor

* revert test changes

* add schedule

* change endpoint, set candlestick bar max width (#785)

* Fix chart price change (#786)

* calc price change by closing prices

* update wallet to 1.10.20

* update wallet to 1.10.21 & update not translated strings (#787)

* reset zoom end (#788)

* Replace chart price updates polling to Subquery subscription (#790)

* wip watch fiatPrice

* price timestamp sync

* refactoring

* improve chart price updates (#791)

* switch to polkadot channel

* break parsing when price is zero (#793)

* filter & dnd update (#800)

* add translations

* update wallet

* do not show add token btn for native token (#805)

* enable xstusd pools (#798)

* prework

* Increase version

* Update SelectToken.vue

* Update AddLiquidity.vue

* Up version

Co-authored-by: Stefan Popov <[email protected]>

* Swap using different dexes (#809)

* swap using different dexes

* fix market algorithm

* Cherry pick commits from master (#807)

* Fix Subquery endpoint (#762)

* Update AppHeader.vue

* Update Jenkinsfile

* Update bridge contract for mainnet (#802)

Co-authored-by: Nikita Polyakov <[email protected]>

* PW-752: Add tab index for all needed components (#789)

* Improved focus functionality.

* Cherry pick all changes from master (#815)

* Fix demeter styles (#808)

* Fix demeter styles

* Update whitelist.json

* Add link to UX research (#813)

* Add link to UX research

* Add an ability to remove less than 1 (#814)

* PW-855: Charts Enable Button (#812)

* Added Charts Enable Switch.

* Updated translations.

* Updated translations.

* Charts Switch: Updated design.

* Charts Switch: Cosmetic Fix.

* Improve storage validation

Co-authored-by: alexnatalia <[email protected]>
Co-authored-by: Stefan Popov <[email protected]>

* Removed focus for tooltip. (#816)

Co-authored-by: alexnatalia <[email protected]>
Co-authored-by: Stefan Popov <[email protected]>

* Fix max input value (#817)

* Fix max input value

* Update Swap.vue

* match contract addresses in lower case (#818)

Co-authored-by: Stefan Popov <[email protected]>

* Updated translation. (#821)

* Fix 1.10 issues (#823)

* Fix wallet send paddings

* Fix zero fiat values when subquery is down

* Fix zero fiat when subquery is down for rewards header

* Update yarn.lock

* Tokens page fixes (#822)

* tokens page fixes

* fix app menu on tokens page

* refactoring tokens container class

Co-authored-by: Stefan Popov <[email protected]>

* Add Sepolia support (#799) (#824)

* Hide Charts Switch Settings By Env Flag. (#825)

* fix chart y label (#826)

Co-authored-by: Stefan Popov <[email protected]>

* Enabling Settings For Undefined Second Asset Or Only One Market Algorithm (#827)

* Turned On Market Algorithms Settings.

* Enabled Settings For Undefined Second Asset Or Only One Market Algorithm.

* Fixed Custom Slippage Tolerance Outline.

Co-authored-by: alexnatalia <[email protected]>

* Fixed Referral Page Tabs. (#828)

* update swap route (#830)

* Fixed Rewards Tabs Underline. (#832)

* update reserves subscription (#833)

* Update extensions links & translations (#834)

* remove unused translations

* update wallet

* update translations

* fix swap token switch (#835)

* [Swap chart] Fix X-axis labels css (#836)

* swap chart fix x axis labels css

* remove unused option

* update wallet & add translations (#837)

* [Demeter Farming] dont show APR& TVL if no prices from subquery (#839)

* dont show apr & tvl if no prices from subquery'

* fix roi

* revert env.json

* Optimize swap subscription (#842)

* freeze subscription payload

* update wallet to 1.10.36

* update swap subscriptions (#843)

* update swap subscriptions

* update wallet to 1.10.37

* Fix max btn visibility for remove liquidity & farming (#844)

* fix max btn visibility for remove liquidity & farming

* add MAX_PART

* Use consts in translations (#845)

* use translation consts

* update wallet to 1.10.38

* reimport from localise

* revert change in ReferalProgram

* PW-626: Refactor Languages (#756)

* Refactored Translation.

* Updated translation.

* remove unused vars

* fix sora in translations

* translation fixes

* fix whitespaces

* remove @:appName

* reimport from localise

* add AppName const

* remove unused import

Co-authored-by: alexnatalia <[email protected]>
Co-authored-by: Nikita-Polyakov <[email protected]>

* fix balance check for adding liqudity & messages (#846)

* Update project dependencies (#847)

* add @types/jsdom

* replace file-loader for asset resource

* replace node-sass to sass

* update types packages

* upgrade babel & @typescript-eslint

* try to add logs to webpack

* update ethers

* update vue-template-compiler

* update sass loader

* update node-polyfill

* update dependency tree using yarn-deduplicate

* Fix bridge thischain & fiat when subquery is down (#848)

* Enable USDT for HASHI bridge

* Hide marketing section

* Update lib version with bridge fix

* Update lib

* Fix issues (#850)

* Fix block explorer links

* Fix local config

* Fix issue with infinite loader because of subquery

* Update BridgeTransactionsHistory.vue

* test image updater

* Fix release issues (#851)

* Fix moonpay behavior during log in

* Update translation strings

* Update wallet

* Hide balances fields for not connected accounts

* Update languages

* Fix low XOR value dialog behavior

* Fix type checking issue

* Fix connect account text

* Fix block number on swap with chart & tokens pages

* Update bridge contract

* Remove evm network type from local storage & fix network checks (#854)

* Remove it cuz assets were removed from the whitelist

Co-authored-by: Nikita Polyakov <[email protected]>
Co-authored-by: Alex Natalia <[email protected]>
Co-authored-by: Rustem <[email protected]>
Co-authored-by: Nikita-Polyakov <[email protected]>
Co-authored-by: sunlucky163 <[email protected]>
Co-authored-by: sunlucky163 <[email protected]>
Co-authored-by: Bao Tran <[email protected]>
Co-authored-by: Bao Nguyen Tran <[email protected]>
Co-authored-by: Pavel Varfolomeev <[email protected]>
Co-authored-by: wpi86 <[email protected]>
Co-authored-by: Dmitriy Creed <[email protected]>
Co-authored-by: alexnatalia <[email protected]>
Co-authored-by: Pavel Varfolomeev <[email protected]>
  • Loading branch information
@stefashkaa @Nikita-Polyakov
@alexnatalia @RustemYuzlibaev @sunlucky163 @baotn166 @wpi86 @Cre-eD
14 people authored Nov 11, 2022
1 parent e25af32 commit 6dce556
Show file tree
Hide file tree
Showing 38 changed files with 956 additions and 1,044 deletions.
2 changes: 1 addition & 1 deletion env.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"MASTER": "0xd1eeb2f30016fffd746233ee12c486e7ca8efef1"
},
"OTHER": {
"MASTER": "0x6F984C337aD5b7C2084805042AE942cef462e3ff"
"MASTER": "0x313416870A4da6F12505a550B67bB73c8E21D5d3"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polkaswap-exchange-web",
"version": "1.10.0",
"version": "1.10.1",
"repository": {
"type": "git",
"url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"@metamask/detect-provider": "^2.0.0",
"@soramitsu/soraneo-wallet-web": "1.10.40",
"@soramitsu/soraneo-wallet-web": "1.10.44",
"@walletconnect/web3-provider": "^1.8.0",
"base-64": "^1.0.0",
"core-js": "^3.26.0",
Expand Down
2 changes: 1 addition & 1 deletion public/env.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"id": 0,
"symbol": "ETH",
"currency": "ETH",
"defaultType": "rinkeby",
"defaultType": "sepolia",
"CONTRACTS": {
"XOR": {
"MASTER": "0x12c6a709925783f49fcca0b398d13b0d597e6e1c"
Expand Down
22 changes: 15 additions & 7 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</app-menu>
<div class="app-body" :class="{ 'app-body__about': isAboutPage }">
<s-scrollbar class="app-body-scrollbar">
<div v-if="blockNumber && !isAboutPage" class="block-number">
<div v-if="blockNumber && !isCurrentPageTooWide" class="block-number">
<s-tooltip :content="t('blockNumberText')" placement="bottom" tabindex="-1">
<a class="block-number-link" :href="soraExplorerLink" target="_blank" rel="nofollow noopener">
<a class="block-number-link" :href="blockExplorerLink" target="_blank" rel="nofollow noopener">
<span class="block-number-icon"></span><span>{{ blockNumberFormatted }}</span>
</a>
</s-tooltip>
Expand Down Expand Up @@ -245,12 +245,16 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
});
}
private get isSwapPageWithCharts(): boolean {
return this.$route.name === PageNames.Swap && this.chartsEnabled;
}
get isAboutPage(): boolean {
return this.$route.name === PageNames.About;
}
get isSwapPage(): boolean {
return this.$route.name === PageNames.Swap;
get isCurrentPageTooWide(): boolean {
return this.isAboutPage || this.isSwapPageWithCharts || this.$route.name === PageNames.Tokens;
}
get appClasses(): Array<string> {
Expand All @@ -259,7 +263,7 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
if (this.$route.name) {
cssClasses.push(`${baseClass}--${this.$route.name.toLowerCase()}`);
}
if (this.chartsEnabled && this.isSwapPage) {
if (this.isSwapPageWithCharts) {
cssClasses.push(`${baseClass}--has-charts`);
}
return cssClasses;
Expand All @@ -269,8 +273,12 @@ export default class App extends Mixins(mixins.TransactionMixin, NodeErrorMixin)
return new FPNumber(this.blockNumber).toLocaleString();
}
get soraExplorerLink(): string {
return getExplorerLinks(this.soraNetwork)[0].value;
get blockExplorerLink(): Nullable<string> {
const links = getExplorerLinks(this.soraNetwork);
if (!links.length) {
return null;
}
return links[0].value;
}
get showBrowserNotifPopup(): boolean {
Expand Down
17 changes: 11 additions & 6 deletions src/components/App/Header/AppHeader.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<header class="header">
<s-button class="app-menu-button" type="action" primary icon="basic-more-horizontal-24" @click="toggleMenu" />
<app-logo-button class="app-logo--header" responsive :theme="libraryTheme" @click="goTo(PageNames.Swap)" />
<div v-if="moonpayEnabled" class="app-controls app-controls--moonpay s-flex">
<div v-if="areMoonpayButtonsVisible" class="app-controls app-controls--moonpay s-flex">
<s-button
type="tertiary"
size="medium"
Expand All @@ -12,9 +12,9 @@
>
<span class="moonpay-button-text">{{ t('moonpay.buttons.buy') }}</span>
</s-button>
<moonpay-history-button v-if="isLoggedIn" class="moonpay-button moonpay-button--history" />
<moonpay-history-button class="moonpay-button moonpay-button--history" />
</div>
<div class="app-controls s-flex">
<div class="app-controls s-flex" :class="{ 'without-moonpay': !areMoonpayButtonsVisible }">
<market-maker-countdown />
<s-button type="action" class="node-control s-pressed" :tooltip="nodeTooltip" @click="openNodeSelectionDialog">
<token-logo class="node-control__logo token-logo" v-bind="nodeLogo" />
Expand Down Expand Up @@ -50,7 +50,7 @@ import { getter, mutation } from '@/store/decorators';
@Component({
components: {
WalletAvatar: components.WalletAvatar as any,
WalletAvatar: components.WalletAvatar,
PolkaswapLogo,
AccountButton: lazyComponent(Components.AccountButton),
AppLogoButton: lazyComponent(Components.AppLogoButton),
Expand Down Expand Up @@ -92,6 +92,10 @@ export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin
};
}
get areMoonpayButtonsVisible(): boolean {
return this.moonpayEnabled && this.isLoggedIn;
}
openNodeSelectionDialog(): void {
this.setSelectNodeDialogVisibility(true);
}
Expand Down Expand Up @@ -203,8 +207,9 @@ export default class AppHeader extends Mixins(WalletConnectMixin, NodeErrorMixin
}
}
// TODO: Check for moonpay=false, seems like an issue
// margin-left: auto;
&.without-moonpay {
margin-left: auto;
}
@include desktop {
margin-left: auto;
Expand Down
9 changes: 8 additions & 1 deletion src/components/Input/TokenInput.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<div class="input-value">
<slot name="balance">
<template v-if="token">
<template v-if="isBalanceAvailable">
<span class="input-value--uppercase">{{ t('balanceText') }}</span>
<formatted-amount-with-fiat-value
value-can-be-hidden
Expand Down Expand Up @@ -79,6 +79,7 @@ import TranslationMixin from '@/components/mixins/TranslationMixin';
import { lazyComponent } from '@/router';
import { Components, ZeroStringValue } from '@/consts';
import { getter } from '@/store/decorators';
import type { CodecString } from '@sora-substrate/util';
import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
Expand Down Expand Up @@ -107,6 +108,12 @@ export default class TokenInput extends Mixins(
readonly delimiters = FPNumber.DELIMITERS_CONFIG;
@getter.wallet.account.isLoggedIn private isLoggedIn!: boolean;
get isBalanceAvailable(): boolean {
return this.isLoggedIn && !!this.token;
}
get address(): string {
return this.token?.address ?? '';
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/mixins/NetworkFormatterMixin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { state, getter } from '@/store/decorators';

@Component
export default class NetworkFormatterMixin extends Vue {
@state.web3.networkType networkType!: EvmNetworkType;
@state.web3.networkType networkType!: Nullable<EvmNetworkType>;
@state.wallet.settings.soraNetwork soraNetwork!: Nullable<WALLET_CONSTS.SoraNetwork>;

@getter.web3.defaultNetworkType defaultNetworkType!: Nullable<EvmNetworkType>;
Expand Down
73 changes: 34 additions & 39 deletions src/lang/cs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@
"polkadotjs": {
"noExtensions": "Nebylo nalezeno žádné rozšíření {PolkadotJs}. Nainstalujte si jej prosím a znovu načtěte tuto stránku\n https:\/\/polkadot.js.org\/extension\/",
"noAccounts": "Zdá se, že ve vašem rozšíření {extension} nejsou žádné účty. Přidejte účet a zkuste to znovu prosím.",
"noAccount": "Chyba účtu {PolkadotJs}. Zkontrolujte prosím svůj účet v rozšíření {PolkadotJs}.",
"noAccount": "Chyba účtu {extension}. Zkontrolujte prosím svůj účet v rozšíření {extension}.",
"noExtension": "Nebylo nalezeno žádné {extension} . Nainstalujte jej a znovu načtěte tuto stránku",
"noSigner": "Přístup odepřen. Přejděte do nastavení {extension} a povolte otevřením možnosti Správa přístupu k webu."
},
"connection": {
"title": "Účet sítě {Sora}",
"text": "Připojte své účty sítě {Sora} nebo vytvořte nové pomocí rozšíření prohlížeče {PolkadotJs}. Toto rozšíření umožňuje bezpečně podepisovat transakce a spravovat aktiva v síti {Sora}.",
"text": "Připojte nebo vytvořte svůj účet sítě {Sora} s {extensions}. Tato rozšíření vám umožňují bezpečně podepisovat transakce a spravovat aktiva v síti {Sora}.",
"noAccounts": "V rozšíření prohlížeče {extension} nebyl nalezen žádný účet. Přidejte prosím účet a zkuste to znovu.",
"selectAccount": "Vyberte účet, se kterým chcete pracovat",
"action": {
Expand Down Expand Up @@ -192,12 +192,9 @@
"scam": "SCAM",
"next": "Další",
"AddAssetToken": {
"title": "Tokeny",
"title": "Měny",
"switchBtn": "Pouze ověřená aktiva"
},
"AddAssetNFT": {
"title": "NFT"
},
"searchInputText": "Vyhledávání podle Asset ID, Name nebo Ticker Symbol"
},
"createToken": {
Expand Down Expand Up @@ -240,7 +237,6 @@
"provideContent": "Poskytněte obsah",
"selectLocalFile": "Vyberte místní soubor",
"CreateSimpleToken": "Token",
"CreateNftToken": "NFT",
"nft": {
"source": {
"label": "Zdroj",
Expand Down Expand Up @@ -394,10 +390,10 @@
"errors": {
"connection": "Při připojování k nodu došlo k chybě\n{address}\n",
"network": "Node\n{address}\n je z jiné sítě\n",
"existing": "Tento node je již přidán: '{title}'\n"
"existing": "Tento node je již přidán: {title}\n"
},
"messages": {
"connected": "Spojení navázáno s nodem\n {address}\n",
"connected": "Spojení navázáno s nodem\n{address}\n",
"selectNode": "Vyberte node pro připojení ze seznamu nodů, prosím."
},
"warnings": {
Expand Down Expand Up @@ -695,7 +691,7 @@
"confirmSupply": {
"title": "Váš podíl v poolu bude",
"outputDescription": "Výstup je odhadován. Pokud se cena změní o více než {slippageTolerance}%, transakce se vrátí zpět.",
"poolTokensBurned": "{first} - {second} Pool tokeny spálené",
"poolTokensBurned": "{first}-{second} Pool tokeny spálené",
"price": "Cena"
},
"addLiquidity": {
Expand Down Expand Up @@ -911,7 +907,7 @@
"bondedXOR": "Vázané XOR",
"referralsNumber": "{number} doporučení",
"startInviting": "Bond XOR doporučit ostatním",
"preview": "Pozvěte nové uživatele a získejte 10 % z jejich transakčních poplatků.<br \/>Pro začátek se zavažte libovolnou částkou XOR. <a href=\"#\" target=\"_blank\" rel=\"nofollow noopener\" class=\"link\">Zjistěte více<\/a>",
"preview": "Pozvěte nové uživatele a získejte 10 % z jejich transakčních poplatků.<br\/>Pro začátek se zavažte libovolnou částkou XOR. <a href=\"#\" target=\"_blank\" rel=\"nofollow noopener\" class=\"link\">Zjistěte více<\/a>",
"deposit": "Vklad",
"balance": "Zůstatek",
"networkFee": "@:networkFeeText",
Expand Down Expand Up @@ -1024,39 +1020,39 @@
"historyErrorMessages": {
"generalError": "Něco se pokazilo",
"balances": {
"LiquidityRestrictions": "Omezení likvidity účtu brání výběru"
"liquidityrestrictions": "Omezení likvidity účtu brání výběru"
},
"poolXyk": {
"SourceBalanceIsNotLargeEnough": "Zdrojová bilance není dostatečně velká",
"TargetBalanceIsNotLargeEnough": "Cílová bilance není dostatečně velká",
"ImpossibleToDecideValidPairValuesFromRangeForThisPool": "Poskytované částky jsou příliš různorodé",
"CalculatedValueIsNotMeetsRequiredBoundaries": "Částky jsou mimo požadované hranice",
"UnableToDepositXorLessThanMinimum": "XOR nižší než minimální hodnota (0,007)",
"ZeroValueInAmountParameter": "Parametr množství má nulovou hodnotu"
"poolxyk": {
"sourcebalanceisnotlargeenough": "Zdrojová bilance není dostatečně velká",
"targetbalanceisnotlargeenough": "Cílová bilance není dostatečně velká",
"impossibletodecidevalidpairvaluesfromrangeforthispool": "Poskytované částky jsou příliš různorodé",
"calculatedvalueisnotmeetsrequiredboundaries": "Částky jsou mimo požadované hranice",
"unabletodepositxorlessthanminimum": "XOR nižší než minimální hodnota (0,007)",
"zerovalueinamountparameter": "Parametr množství má nulovou hodnotu"
},
"xstPool": {
"PoolAlreadyInitializedForPair": "Pool pár již existuje",
"SlippageLimitExceeded": "Tolerance prokluzu nesplňuje správné limity"
"xstpool": {
"poolalreadyinitializedforpair": "Pool pár již existuje",
"slippagelimitexceeded": "Tolerance prokluzu nesplňuje správné limity"
},
"referrals": {
"AlreadyHasReferrer": "Účet již má referrera",
"ReferrerInsufficientBalance": "Referrer nemá dostatek rezervovaného zůstatku"
"alreadyhasreferrer": "Účet již má referrera",
"referrerinsufficientbalance": "Referrer nemá dostatek rezervovaného zůstatku"
},
"vestedRewards": {
"RewardsSupplyShortage": "Program odměn již skončil",
"CantCalculateReward": "Výpočet odměny se nezdařil",
"NoRewardsForAsset": "Za toto aktivum nejsou žádné odměny"
"vestedrewards": {
"rewardssupplyshortage": "Program odměn již skončil",
"cantcalculatereward": "Výpočet odměny se nezdařil",
"norewardsforasset": "Za toto aktivum nejsou žádné odměny"
},
"liquidityProxy": {
"ForbiddenFilter": "Vybraný zdroj likvidity není povolen"
"liquidityproxy": {
"forbiddenfilter": "Vybraný zdroj likvidity není povolen"
},
"demeterFarmingPlatform": {
"InsufficientFunds": "Nedostatečné finanční prostředky",
"InsufficientLPTokens": "Nedostatek tokenů pro poskytování likvidity",
"PoolDoesNotHaveRewards": "Pool nemá odměny"
"demeterfarmingplatform": {
"insufficientfunds": "Nedostatečné finanční prostředky",
"insufficientlptokens": "Nedostatek tokenů pro poskytování likvidity",
"pooldoesnothaverewards": "Pool nemá odměny"
},
"multicollateralBondingCurvePool": {
"PriceCalculationFailed": "Při výpočtu ceny došlo k chybě"
"multicollateralbondingcurvepool": {
"pricecalculationfailed": "Při výpočtu ceny došlo k chybě"
}
},
"receivedText": "Přijato",
Expand All @@ -1073,8 +1069,7 @@
"ofText": "{first} z {second}",
"filter": {
"all": "Všechny",
"token": "Tokeny",
"nft": "NFT",
"token": "Měny",
"verifiedOnly": "Zobrazit pouze ověřená díla",
"zeroBalance": "Skrýt 0 bilančních aktiv",
"showAssets": "Zobrazit aktiva",
Expand Down Expand Up @@ -1130,7 +1125,7 @@
"password": "Heslo se neshoduje",
"passwords": "Hesla se neshodují",
"mnemonic": "Byla zadána neplatná mnemotechnická pomůcka bip39",
"mnemonicLength": "Mnemotechnika by měla obsahovat {číslo} slov",
"mnemonicLength": "Mnemotechnika by měla obsahovat {number} slov",
"jsonFields": "Soubor JSON neobsahuje povinná pole"
}
},
Expand Down
Loading

0 comments on commit 6dce556

Please sign in to comment.