Skip to content

Commit

Permalink
Release/1.10.0 update 19.10.2022 (#838)
Browse files Browse the repository at this point in the history 
* update wallet 1.7.24 (#608)

* Fix header menu issues (#610)

* handle case when eth completed later than restoration (#611)

* Referral System: Invited Users Subscription (#612)

* Referral System: Added Invited Users Subscription.

* Fix UI issues (#613)

* Update ConfirmBonding.vue

* Fix types

* Fix scroll for dialog wrappers

* update wallet

* Fix click outside

Co-authored-by: Nikita-Polyakov <polyakov@soramitsu.co.jp>

* Fix referral system issue (#614)

* Fix referral system issue

* Update yarn.lock

* Fix is bond state (#616)

* up wallet version to 1.7.28 in package.json (#617)

* up wallet version to 1.7.28 in package.json

* update yarn.lock

* Fix fiat values, update bridge history request (#603)

* replace PaginationSearchMixin

* improve bridge history fetching

* update wallet to 1.7.29

* Fix dialogs & fix select token dialog for custom assets (#620)

* Fix node dialog

* Fix other dialogs

* Improve performance

* Update SelectToken.vue

* Referral Rewards Fix (#621)

* Fixed Referral Rewards.

* Remove deprecated code (#622)

* update wallet to 1.7.31 (xor min price) (#624)

* 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 <polyakov@soramitsu.co.jp>

* bridge tx restoration improvements (#663)

* bridge tx restoration improvements

* fix ternary condition

Co-authored-by: Stefan Popov <stefanpopov@list.ru>

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

* wip subscriptions

* update rewards to subscriptions

* fix subscription calls

Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* 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 <53777036+Nikita-Polyakov@users.noreply.github.com>

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

* prework

* refactor

* Update PairTokenLogo.vue

Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* 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 <rustem.yuzlibaev@yandex.ru>

* 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 <stefanpopov@list.ru>

* 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 <53777036+Nikita-Polyakov@users.noreply.github.com>

* 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 <alekseenko@soramitsu.co.jp>
Co-authored-by: Nikita-Polyakov <polyakov@soramitsu.co.jp>
Co-authored-by: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com>

* [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 <alekseenko@soramitsu.co.jp>

* 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 <polyakov@soramitsu.co.jp>

* 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 <alekseenko@soramitsu.co.jp>

* 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 <stefanpopov@list.ru>

* 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 <53777036+Nikita-Polyakov@users.noreply.github.com>

* 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 <alekseenko@soramitsu.co.jp>
Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* Removed focus for tooltip. (#816)

Co-authored-by: alexnatalia <alekseenko@soramitsu.co.jp>
Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* Fix max input value (#817)

* Fix max input value

* Update Swap.vue

* match contract addresses in lower case (#818)

Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* 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 <stefanpopov@list.ru>

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

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

* fix chart y label (#826)

Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* 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 <alekseenko@soramitsu.co.jp>

* 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)

Co-authored-by: Stefan Popov <stefanpopov@list.ru>
Co-authored-by: Alex Natalia <38787212+alexnatalia@users.noreply.github.com>
Co-authored-by: Rustem <rustem.yuzlibaev@yandex.ru>
Co-authored-by: sunlucky163 <mishushin93@gmail.com>
Co-authored-by: sunlucky163 <44086186+sunlucky163@users.noreply.github.com>
Co-authored-by: Bao Tran <baotn166@gmail.com>
Co-authored-by: Bao Nguyen Tran <baotn166@users.noreply.github.com>
Co-authored-by: Pavel Varfolomeev <varfolomeev@soramitsu.co.jp>
Co-authored-by: wpi86 <86880521+wpi86@users.noreply.github.com>
Co-authored-by: Dmitriy Creed <creed@soramitsu.co.jp>
Co-authored-by: alexnatalia <alekseenko@soramitsu.co.jp>
  • Loading branch information
@Nikita-Polyakov @stefashkaa
@alexnatalia @RustemYuzlibaev @sunlucky163 @baotn166 @wpi86 @Cre-eD
12 people authored Oct 19, 2022
1 parent acef7bf commit b4b4de7
Show file tree
Hide file tree
Showing 33 changed files with 405 additions and 348 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@metamask/detect-provider": "^1.2.0",
"@soramitsu/soraneo-wallet-web": "1.10.32",
"@soramitsu/soraneo-wallet-web": "1.10.35",
"@walletconnect/web3-provider": "^1.6.6",
"core-js": "^3.6.4",
"direct-vuex": "^0.12.1",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Input/TokenInput.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
with-left-shift
value-class="input-value--primary"
:value="formattedBalance"
:has-fiat-value="tokenPrice"
:has-fiat-value="!!tokenPrice"
:fiat-value="formattedFiatBalance"
/>
</template>
Expand Down Expand Up @@ -55,7 +55,7 @@
</div>
<div slot="bottom" class="input-line input-line--footer">
<div class="s-flex">
<formatted-amount v-if="tokenPrice" is-fiat-value :value="fiatAmount" />
<formatted-amount v-if="!!tokenPrice" is-fiat-value :value="fiatAmount" />
<slot name="fiat-amount-append" />
</div>

Expand Down
18 changes: 6 additions & 12 deletions src/components/Swap/Chart.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,15 +354,6 @@ export default class SwapChart extends Mixins(
return calcPriceChange(rangeClosePrice, rangeStartPrice);
}
get timeFormat(): string {
switch (this.selectedFilter.type) {
case SUBQUERY_TYPES.AssetSnapshotTypes.DAY:
return 'll';
default:
return 'LT';
}
}
get axisLabelCSS() {
return {
fontFamily: 'Sora',
Expand Down Expand Up @@ -437,7 +428,8 @@ export default class SwapChart extends Mixins(
const date = dayjs(+value);
const isNewDay = date.hour() === 0 && date.minute() === 0;
const isNewMonth = date.date() === 1 && isNewDay;
const timeFormat = isNewMonth ? 'MMMM' : isNewDay ? 'D' : 'LT';
// TODO: "LT" formatted labels (hours) sometimes overlaps (AM\PM issue)
const timeFormat = isNewMonth ? 'MMMM' : isNewDay ? 'D' : 'HH:mm';
const formatted = this.formatDate(+value, timeFormat);
if (isNewMonth) {
Expand All @@ -451,10 +443,12 @@ export default class SwapChart extends Mixins(
},
rich: {
monthStyle: {
fornWeight: 'bold',
fontSize: 10,
fontWeight: 'bold',
},
dateStyle: {
fornWeight: 'bold',
fontSize: 10,
fontWeight: 'bold',
},
},
color: this.theme.color.base.content.secondary,
Expand Down
3 changes: 1 addition & 2 deletions src/components/Swap/Confirm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import { api, components, mixins } from '@soramitsu/soraneo-wallet-web';
import type { CodecString } from '@sora-substrate/util';
import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
import type { LiquiditySourceTypes } from '@sora-substrate/liquidity-proxy/build/consts';
import type { DexId } from '@sora-substrate/util/build/poolXyk/consts';
import { lazyComponent } from '@/router';
import { Components } from '@/consts';
Expand All @@ -60,7 +59,7 @@ export default class ConfirmSwap extends Mixins(mixins.TransactionMixin, mixins.
@state.swap.fromValue private fromValue!: string;
@state.swap.toValue private toValue!: string;
@state.swap.isExchangeB isExchangeB!: boolean;
@state.swap.selectedDexId private selectedDexId!: DexId;
@state.swap.selectedDexId private selectedDexId!: number;
@getter.swap.minMaxReceived private minMaxReceived!: CodecString;
@getter.swap.swapLiquiditySource private liquiditySource!: LiquiditySourceTypes;
Expand Down
10 changes: 5 additions & 5 deletions src/components/TransactionDetails/SwapTransactionDetails.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@

<script lang="ts">
import { Component, Mixins, Prop } from 'vue-property-decorator';
import { components, mixins } from '@soramitsu/soraneo-wallet-web';
import { api, components, mixins } from '@soramitsu/soraneo-wallet-web';
import { CodecString, Operation, NetworkFeesObject } from '@sora-substrate/util';
import { XOR, XSTUSD, KnownAssets } from '@sora-substrate/util/build/assets/consts';
import { DexId } from '@sora-substrate/util/build/poolXyk/consts';
import { XOR, KnownAssets } from '@sora-substrate/util/build/assets/consts';
import type { LPRewardsInfo } from '@sora-substrate/liquidity-proxy/build/types';
import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
Expand Down Expand Up @@ -82,7 +81,7 @@ export default class SwapTransactionDetails extends Mixins(mixins.FormattedAmoun
@state.swap.liquidityProviderFee private liquidityProviderFee!: CodecString;
@state.swap.rewards private rewards!: Array<LPRewardsInfo>;
@state.swap.isExchangeB isExchangeB!: boolean;
@state.swap.selectedDexId private selectedDexId!: DexId;
@state.swap.selectedDexId private selectedDexId!: number;
@getter.swap.price private price!: string;
@getter.swap.priceReversed private priceReversed!: string;
Expand All @@ -101,7 +100,8 @@ export default class SwapTransactionDetails extends Mixins(mixins.FormattedAmoun
get swapRoute(): Array<string> {
const fromToken: string = this.tokenFrom?.symbol ?? '';
const toToken: string = this.tokenTo?.symbol ?? '';
const baseToken = this.selectedDexId === DexId.XOR ? XOR.symbol : XSTUSD.symbol;
const baseAssetId = api.dex.getBaseAssetId(this.selectedDexId);
const baseToken = KnownAssets.get(baseAssetId).symbol;
return [...new Set([fromToken, baseToken, toToken])]; // To remove doubled XOR if the route is simple
}
Expand Down
24 changes: 14 additions & 10 deletions src/lang/cs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
"DemeterFarmingWithdrawLiquidity": "Odebrány {symbol} a {symbol2} {amount} LP tokeny",
"DemeterFarmingStakeToken": "Přidáno {amount} {symbol}",
"DemeterFarmingUnstakeToken": "Odebráno {amount} {symbol}",
"DemeterFarmingGetRewards": "Úspěšně nárokováno {amount} {symbol}"
"DemeterFarmingGetRewards": "Úspěšně nárokováno {amount} {symbol}",
"EthBridgeIncoming": "Převedeno {amount} {symbol} z @:ethereumText do @:soraText",
"EthBridgeOutgoing": "Převedeno {amount} {symbol} z @:soraText do @:ethereumText"
},
"error": {
"Transfer": "{action} {amount} {symbol} {direction} {address} se nezdařilo.",
Expand All @@ -67,7 +69,9 @@
"DemeterFarmingWithdrawLiquidity": "Nepodařilo se odstranit tokeny LP {amount} {symbol} a {symbol2}",
"DemeterFarmingStakeToken": "Nepodařilo se přidat {amount} {symbol}",
"DemeterFarmingUnstakeToken": "Nepodařilo se odebrat {amount} {symbol}",
"DemeterFarmingGetRewards": "Nepodařilo se nárokovat {symbol}"
"DemeterFarmingGetRewards": "Nepodařilo se nárokovat {symbol}",
"EthBridgeIncoming": "Nepodařilo se přenést {amount} {symbol} z @:ethereumText do @:soraText",
"EthBridgeOutgoing": "Nepodařilo se převést {amount} {symbol} z @:soraText do @:ethereumText"
},
"ReferralReserveXor": "Vázat XOR",
"ReferralUnreserveXor": "Zrušit vazbu XOR",
Expand All @@ -77,23 +81,22 @@
"DemeterFarmingWithdrawLiquidity": "Zrušte likviditu",
"DemeterFarmingStakeToken": "Token sázky",
"DemeterFarmingUnstakeToken": "Zrušit sázku",
"DemeterFarmingGetRewards": "Nárokovat odměny"
"DemeterFarmingGetRewards": "Nárokovat odměny",
"EthBridgeIncoming": "@:hashiBridgeText",
"EthBridgeOutgoing": "@:hashiBridgeText"
},
"polkadotjs": {
"noExtensions": "Nebylo nalezeno žádné rozšíření Polkadot.js. 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í Polkadot.js nejsou žádné účty. Přidejte účet a zkuste to znovu prosím.",
"noExtensions": "Nebylo nalezeno žádné rozšíření Polkadot{.js}. 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 polkadot.js. Zkontrolujte prosím svůj účet v rozšíření Polkadot.js.",
"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 polkadot{.js}. Toto rozšíření umožňuje bezpečně podepisovat transakce a spravovat aktiva v síti SORA.",
"install": "Rozšíření polkadot.js nebylo nalezeno. Nainstalujte jej a znovu <a href=\"#\" onclick=\"window.location.reload(true);\" class=\"wallet-connection-link\">načtěte<\/a> stránku.<br\/> <span class=\"wallet-connection-link\">https:\/\/polkadot.js.org\/extension\/<\/span>",
"noPermissions": "Omylem zamítnutá žádost o povolení?<\/br> V současné době nemá rozšíření polkadot{.js} správu oprávnění. Jako alternativní řešení můžete restartovat prohlížeč a znovu navštívit tuto stránku, abyste mohli pokračovat v autorizaci.",
"noAccounts": "V rozšíření prohlížeče polkadot{.js} nebyl nalezen žádný účet. Přidejte prosím účet a zkuste to znovu.",
"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",
"loadingTitle": "Čekáme, až povolíte přístup k rozšíření polkadot{.js}.",
"action": {
"install": "Nainstalovat rozšíření",
"learnMore": "Zjistit více",
Expand Down Expand Up @@ -1143,5 +1146,6 @@
"mnemonicLength": "Mnemotechnika by měla obsahovat {číslo} slov",
"jsonFields": "Soubor JSON neobsahuje povinná pole"
}
}
},
"hashiBridgeText": "Most HASHI"
}
24 changes: 14 additions & 10 deletions src/lang/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
"DemeterFarmingWithdrawLiquidity": "{symbol} und {symbol2} {amount} LP-Token entfernt",
"DemeterFarmingStakeToken": "{amount} {symbol} hinzugefügt",
"DemeterFarmingUnstakeToken": "{amount} {symbol} entfernt",
"DemeterFarmingGetRewards": "{amount} {symbol} erfolgreich beansprucht"
"DemeterFarmingGetRewards": "{amount} {symbol} erfolgreich beansprucht",
"EthBridgeIncoming": "Übertragen {amount} {symbol} von @:ethereumText nach @:soraText",
"EthBridgeOutgoing": "Übertragen von {amount} {symbol} von @:soraText nach @:ethereumText"
},
"error": {
"Transfer": "Senden von {amount} {symbol} an {address} fehlgeschlagen",
Expand All @@ -67,7 +69,9 @@
"DemeterFarmingWithdrawLiquidity": "{amount} {symbol} und {symbol2} LP-Token konnten nicht entfernt werden",
"DemeterFarmingStakeToken": "Fehler beim Hinzufügen von {amount} {symbol}",
"DemeterFarmingUnstakeToken": "Entfernen von {amount} {symbol} fehlgeschlagen",
"DemeterFarmingGetRewards": "Anspruch auf {symbol} fehlgeschlagen"
"DemeterFarmingGetRewards": "Anspruch auf {symbol} fehlgeschlagen",
"EthBridgeIncoming": "Fehler beim Übertragen von {amount} {symbol} von @:ethereumText nach @:soraText",
"EthBridgeOutgoing": "Fehler beim Übertragen von {amount} {symbol} von @:soraText nach @:ethereumText"
},
"ReferralReserveXor": "Bonde XOR",
"ReferralUnreserveXor": "Unbonde XOR",
Expand All @@ -77,23 +81,22 @@
"DemeterFarmingWithdrawLiquidity": "Unstake Liquidität",
"DemeterFarmingStakeToken": "Stake Token",
"DemeterFarmingUnstakeToken": "Unstake Token",
"DemeterFarmingGetRewards": "Belohnungen beanspruchen"
"DemeterFarmingGetRewards": "Belohnungen beanspruchen",
"EthBridgeIncoming": "@:hashiBridgeText",
"EthBridgeOutgoing": "@:hashiBridgeText"
},
"polkadotjs": {
"noExtensions": "Es wurde keine Polkadot.js-Erweiterung gefunden. Bitte, installiere sie und lade diese Seite erneut\nhttps:\/\/polkadot.js.org\/extension\/",
"noAccounts": "Es scheint keine Konten in deiner Polkadot.js-Erweiterung zu geben. Bitte, füge ein Konto hinzu und versuche es erneut.",
"noExtensions": "Es wurde keine Polkadot{.js} Erweiterung gefunden. Bitte, installiere sie und lade diese Seite erneut\nhttps:\/\/polkadot.js.org\/extension\/",
"noAccounts": "Es scheint keine Konten in deiner {extension} Erweiterung zu geben. Bitte, füge ein Konto hinzu und versuche es erneut.",
"noAccount": "{extension} Kontofehler. Bitte überprüfe dein Konto in der {extension} Erweiterung",
"noExtension": "Es wurde keine {extension} gefunden. Bitte installiere es und lade diese Seite neu",
"noSigner": "Zugriff abgelehnt. Gehe zu den Erweiterungseinstellungen von {extension} und öffne \"Website-Zugriff verwalten\", um dies zuzulassen."
},
"connection": {
"title": "SORA-Netzwerk-Konto",
"text": "Verbinde deine SORA-Netzwerk-Konten oder erstelle neue Konten mit der Polkadot{.js} -Browser-Erweiterung. Diese Erweiterung ermöglicht es dir, Transaktionen sicher zu unterzeichnen und Assets im SORA-Netzwerk zu verwalten.",
"install": "Es wurde keine Polkadot.js-Erweiterung gefunden. Bitte, installiere die Erweiterung und <a href=\"#\" onclick=\"window.location.reload(true);\" class=\"wallet-connection-link\">lade<\/a> diese Seite erneut.<br\/><span class=\"wallet-connection-link\">https:\/\/polkadot.js.org\/extension\/<\/span>",
"noPermissions": "Berechtigungsanfrage versehentlich abgelehnt?<\/br>Derzeit verfügt die Polkadot{.js} -Erweiterung nicht über eine Berechtigungsverwaltung. Um dies zu umgehen, kannst du deinen Browser neu starten und diese Seite erneut aufrufen, um mit der Autorisierung fortzufahren.",
"noAccounts": "Es wurde kein Konto in deiner Polkadot{.js} -Browser-Erweiterung gefunden. Bitte, füge ein Konto hinzu und versuche es nochmal.",
"noAccounts": "Es wurde kein Konto in deiner {extension} Browser-Erweiterung gefunden. Bitte, füge ein Konto hinzu und versuche es nochmal.",
"selectAccount": "Wähle das Konto aus, das du verwenden möchtest",
"loadingTitle": "Warte darauf, dass du den Zugriff auf die Polkadot{.js} -Erweiterung freigibst.",
"action": {
"install": "Erweiterung installieren",
"learnMore": "Mehr erfahren",
Expand Down Expand Up @@ -1143,5 +1146,6 @@
"mnemonicLength": "Mnemonik sollte {number} Wörter enthalten",
"jsonFields": "Die JSON-Datei enthält keine erforderlichen Felder"
}
}
},
"hashiBridgeText": "HASHI Brücke"
}
26 changes: 15 additions & 11 deletions src/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
"DemeterFarmingWithdrawLiquidity": "Removed {symbol} and {symbol2} {amount} LP tokens",
"DemeterFarmingStakeToken": "Added {amount} {symbol}",
"DemeterFarmingUnstakeToken": "Removed {amount} {symbol}",
"DemeterFarmingGetRewards": "{amount} {symbol} claimed successfully"
"DemeterFarmingGetRewards": "{amount} {symbol} claimed successfully",
"EthBridgeIncoming": "Transfered {amount} {symbol} from @:ethereumText to @:soraText",
"EthBridgeOutgoing": "Transfered {amount} {symbol} from @:soraText to @:ethereumText"
},
"error": {
"Transfer": "Failed to {action} {amount} {symbol} {direction} {address}",
Expand All @@ -67,7 +69,9 @@
"DemeterFarmingWithdrawLiquidity": "Failed to remove {amount} {symbol} and {symbol2} LP tokens",
"DemeterFarmingStakeToken": "Failed to add {amount} {symbol}",
"DemeterFarmingUnstakeToken": "Failed to remove {amount} {symbol}",
"DemeterFarmingGetRewards": "Failed to claim {symbol}"
"DemeterFarmingGetRewards": "Failed to claim {symbol}",
"EthBridgeIncoming": "Failed to transfer {amount} {symbol} from @:ethereumText to @:soraText",
"EthBridgeOutgoing": "Failed to transfer {amount} {symbol} from @:soraText to @:ethereumText"
},
"ReferralReserveXor": "Bond XOR",
"ReferralUnreserveXor": "Unbond XOR",
Expand All @@ -77,23 +81,22 @@
"DemeterFarmingWithdrawLiquidity": "Unstake Liquidity",
"DemeterFarmingStakeToken": "Stake Token",
"DemeterFarmingUnstakeToken": "Unstake Token",
"DemeterFarmingGetRewards": "Claim Rewards"
"DemeterFarmingGetRewards": "Claim Rewards",
"EthBridgeIncoming": "@:hashiBridgeText",
"EthBridgeOutgoing": "@:hashiBridgeText"
},
"polkadotjs": {
"noExtensions": "No Polkadot.js extension was found. Please install it and reload this page\nhttps:\/\/polkadot.js.org\/extension\/",
"noAccounts": "There seems to be no accounts in your Polkadot.js extension. Please add an account and try again.",
"noExtensions": "No Polkadot{.js} extension was found. Please install it and reload this page\nhttps:\/\/polkadot.js.org\/extension\/",
"noAccounts": "There seems to be no accounts in your {extension} extension. Please add an account and try again.",
"noAccount": "{extension} account error. Please check your account in the {extension} extension",
"noExtension": "No {extension} extension was found. Please install it and reload this page",
"noSigner": "Access denied. Go to {extension} extension settings and open \"Manage Website Access\" to allow."
},
"connection": {
"title": "SORA Network account",
"text": "Connect your SORA Network accounts or create new ones with polkadot{.js} browser extension. This extension allows you to securely sign transactions and manage assets in SORA Network.",
"install": "No polkadot.js extension found. Install it and <a href=\"#\" onclick=\"window.location.reload(true);\" class=\"wallet-connection-link\">reload<\/a> the page.<br\/><span class=\"wallet-connection-link\">https:\/\/polkadot.js.org\/extension\/<\/span>",
"noPermissions": "Accidentally rejected permission request?<\/br>Currently polkadot{.js} extension doesn’t have permission managment. As a workaround you can restart your browser and revisit this page to proceed with authorization.",
"noAccounts": "No account found in your polkadot{.js} browser extension. Please add an account and try again.",
"text": "Connect your SORA Network accounts or create new ones with Polkadot{.js} browser extension. This extension allows you to securely sign transactions and manage assets in SORA Network.",
"noAccounts": "No account found in your {extension} browser extension. Please add an account and try again.",
"selectAccount": "Select account to work with",
"loadingTitle": "Waiting for you to allow access to polkadot{.js} extension.",
"action": {
"install": "Install extension",
"learnMore": "Learn more",
Expand Down Expand Up @@ -1143,5 +1146,6 @@
"mnemonicLength": "Mnemonic should contain {number} words",
"jsonFields": "JSON file does not have required fields"
}
}
},
"hashiBridgeText": "HASHI bridge"
}
Loading

0 comments on commit b4b4de7

Please sign in to comment.