Skip to content

Commit

Permalink
Release 1.13.2 (#933)
Browse files Browse the repository at this point in the history
* Fix fee warning dialog behavior (#910)

* Fix fee warning dialog behavior

* Update deps

* Update yarn.lock

* Fix table overrides

* Fix Demeter explore active positions (#909)

* css fixes & demeter

* update wallet

* Update deps

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

* fix address css (#911)

* Fix asset-asset search in pools on explore page (#913)

* Add tooltips to TVL & ROI (#912)

* add tooltips

* add translations

* up version to 1.13.0

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

* XST tokenomics & remove market maker countdown (#917)

* update views

* update wallet & remove market maker countdown

* update wallet 1.13.1 (#918)

* deploy trigger removal

Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>

* Liiquidity proxy 1.6 (#923)

* update wallet with liqudity proxy

* update swap view

* improve btn loading state (#924)

* up wallet version 1.13.4 (#925)

* up wallet version

* update wallet

* up wallet version to 1.13.5 (#926)

* up wallet version

* update wallet to 1.13.5

* fix ts issues

* Feature/x1-widget (#876)

* move to separate module

* add enabling flag

* Update getters.ts

* remove route

* Update types.ts

* x1 widget

* redesign

* refactor & add X1

* Update RoadMap.vue

* improvements in flow & KYC status

* remove logs

* fixes

* take into account different statuses matches

* settings & stub

* fixes & x1 enabling

* add prod settings

* wip

* organize credentials

* change css

* Update env.json

* css refactoring

* Update env.json

* fixes

* roll out prod widget X1

* remove console.log

* refactor & fixes

* handle no record response

* Update SoraCardIntroPage.vue

* Fix/chart precision (#928)

* fix precision while loop

* improve precision calc

* optional fee popup (#919)

* add checks

* up wallet

* use exact version

* Update wallet

* Update localise files

* Update translation files

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>

* [Remove Liquidity] Show ceres locked liquidity (#922)

* show ceres locked liquidity percent

* change translation of locked

* refactoring rendering

* Update translations

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>
Co-authored-by: Stefan Popov <stefanpopov@list.ru>

* Use settingsStorage from wallet (#929)

* Use settingsStorage from wallet

* Update wallet version

* Hide switch on Explore page for !isLoggedIn

* Update lokalise

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>

* Fix search focus behavior (#932)

Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>

* Remove unused files

---------

Signed-off-by: Nikita Zaporozhets <zaporozhets@soramitsu.co.jp>
Co-authored-by: Rustem <rustem.yuzlibaev@yandex.ru>
Co-authored-by: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com>
Co-authored-by: Nikita-Polyakov <polyakov@soramitsu.co.jp>
Co-authored-by: Stefan Popov <17688105+stefashkaa@users.noreply.github.com>
  • Loading branch information
5 people authored Jan 27, 2023
1 parent 0b9d1de commit 8619181
Show file tree
Hide file tree
Showing 65 changed files with 1,783 additions and 1,624 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"dependencies": {
"@metamask/detect-provider": "^2.0.0",
"@soramitsu/soraneo-wallet-web": "1.13.5",
"@soramitsu/soraneo-wallet-web": "1.13.9",
"@walletconnect/web3-provider": "^1.8.0",
"base-64": "^1.0.0",
"core-js": "^3.26.0",
Expand Down
Binary file added public/card/sora-card-front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/card/sora-card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 0 additions & 68 deletions src/assets/img/sora-card/sora-card-front.svg

This file was deleted.

512 changes: 0 additions & 512 deletions src/assets/img/sora-card/sora-card.svg

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/SelectAsset/SelectToken.vue
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ export default class SelectToken extends Mixins(TranslationMixin, SelectAssetMix
handleTabChange(name: Tabs): void {
this.tabValue = name;
this.handleClearSearch();
this.clearAndFocusSearch();
}
}
</script>
Expand Down
152 changes: 152 additions & 0 deletions src/components/SoraCard/ConfirmationInfo.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<template>
<div class="sora-card container" v-loading="loading">
<div class="sora-card__card">
<s-image
src="card/sora-card-front.png"
lazy
fit="cover"
draggable="false"
class="unselectable sora-card__card-image"
/>
<div class="sora-card__card-icon" :class="computedIconClass">
<s-icon
v-if="!currentStatus || currentStatus === VerificationStatus.Pending"
name="time-time-24"
class="sora-card__card-icon-element"
/>
<s-icon
v-if="currentStatus === VerificationStatus.Accepted"
name="basic-check-marks-24"
class="sora-card__card-icon-element"
/>
<s-icon
v-if="currentStatus === VerificationStatus.Rejected"
name="basic-close-24"
class="sora-card__card-icon-element"
/>
</div>
</div>

<div class="sora-card__header">{{ headerText }}</div>
<p class="sora-card__status-info">
We will let you know if you’re eligible for the SORA card as soon as we get information from our partner,
Paywings. We will notify you.
</p>

<s-button
v-if="currentStatus === VerificationStatus.Rejected"
type="primary"
class="sora-card__btn s-typography-button--large"
>
<span class="text">{{ buttonText }}</span>
</s-button>
</div>
</template>

<script lang="ts">
import { Component, Mixins } from 'vue-property-decorator';
import { mixins } from '@soramitsu/soraneo-wallet-web';
import TranslationMixin from '@/components/mixins/TranslationMixin';
import { VerificationStatus } from '@/types/card';
import { getter } from '@/store/decorators';
@Component
export default class ConfirmationInfo extends Mixins(mixins.LoadingMixin, TranslationMixin) {
@getter.soraCard.currentStatus currentStatus!: VerificationStatus;
readonly VerificationStatus = VerificationStatus;
get buttonText(): string {
return 'Try to complete KYC again';
}
get headerText(): Nullable<string> {
if (!this.currentStatus) return 'KYC completed. Waiting for the results';
switch (this.currentStatus) {
case VerificationStatus.Pending:
return 'KYC completed. Waiting for the results';
case VerificationStatus.Accepted:
return 'You’re approved for SORA Card';
case VerificationStatus.Rejected:
return 'You’re not been approved for SORA Card';
default:
return null;
}
}
get computedIconClass(): string {
const base = 'sora-card__card-icon';
if (!this.currentStatus) return `${base}--waiting`;
switch (this.currentStatus) {
case VerificationStatus.Pending:
return `${base}--waiting`;
case VerificationStatus.Accepted:
return `${base}--succcess`;
case VerificationStatus.Rejected:
return `${base}--reject`;
default:
return '';
}
}
}
</script>

<style lang="scss" scoped>
.sora-card {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
&__header {
margin-top: var(--s-size-mini);
text-align: center;
font-weight: 600;
font-size: 28px;
width: 80%;
}
&__status-info {
margin-top: $basic-spacing;
text-align: center;
width: 85%;
}
&__card {
position: relative;
&-image {
width: 360px;
}
&-icon {
height: 40px;
width: 40px;
right: -10px;
bottom: 0px;
position: absolute;
border-radius: 50%;
&-element {
display: block;
color: #fff;
margin: 20%;
}
&--waiting {
background-color: var(--s-color-base-content-secondary);
opacity: 0.95;
}
&--success {
background-color: var(--s-color-theme-secondary);
}
&--reject {
background-color: var(--s-color-status-error);
}
}
}
.s-icon-basic-check-mark-24 {
color: var(--s-color-status-success);
}
}
</style>
48 changes: 48 additions & 0 deletions src/components/SoraCard/Paywings/PaywingsDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<template>
<dialog-base v-loading="loading" :visible.sync="isVisible" class="pw-dialog">
<div class="wrapper">To be implemented</div>
</dialog-base>
</template>

<script lang="ts">
import { Component, Mixins, Watch } from 'vue-property-decorator';
import { getter, state } from '@/store/decorators';
import { components, mixins } from '@soramitsu/soraneo-wallet-web';
import { loadScript, unloadScript } from 'vue-plugin-load-script';
// TODO: Set up widget for payment
@Component({
components: {
DialogBase: components.DialogBase,
},
})
export default class PaywingsDialog extends Mixins(mixins.DialogMixin, mixins.LoadingMixin) {
@state.soraCard.euroBalance private euroBalance!: string;
@getter.soraCard.accountAddress accountAddress!: string;
@Watch('isVisible', { immediate: true })
private handleVisibleStateChange(visible: boolean): void {
if (visible) {
this.loadPaywings();
} else {
this.unloadPaywings();
}
}
private loadPaywings(): void {
loadScript('https://checkout.paywings.io/HostedFields/custom/js/client.min.js').then(() => {});
}
private unloadPaywings(): void {
unloadScript('https://checkout.paywings.io/HostedFields/custom/js/client.min.js').catch(() => {});
}
}
</script>

<style lang="scss">
.pw-dialog .el-dialog {
.wrapper {
min-height: 420px;
}
}
</style>
Loading

0 comments on commit 8619181

Please sign in to comment.