Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Referral System: Invited Users Subscription #612

Merged
merged 4 commits into from
Feb 28, 2022
Merged

Referral System: Invited Users Subscription #612

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d63436
Referral System: Added Invited Users Subscription.
Feb 28, 2022
f58e2b6
Merge branch 'develop' into feature/referrals-subscription
Feb 28, 2022
544b0af
Updated due to PR comments.
Feb 28, 2022
1fdf618
Referral System: Fixed Loading State.
Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"dependencies": {
"@metamask/detect-provider": "^1.2.0",
"@soramitsu/soraneo-wallet-web": "^1.7.24",
"@soramitsu/soraneo-wallet-web": "^1.7.25",
"@walletconnect/web3-provider": "^1.6.6",
"core-js": "^3.6.4",
"ethers": "^5.5.4",
Expand Down
68 changes: 50 additions & 18 deletions src/store/referrals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
import map from 'lodash/fp/map';
import omit from 'lodash/fp/omit';
import flatMap from 'lodash/fp/flatMap';
import fromPairs from 'lodash/fp/fromPairs';
import flow from 'lodash/fp/flow';
import concat from 'lodash/fp/concat';
import { api } from '@soramitsu/soraneo-wallet-web';
import type { Subscription } from '@polkadot/x-rxjs';

import storage from '@/utils/storage';

const types = flow(
flatMap((x) => [x + '_REQUEST', x + '_SUCCESS', x + '_FAILURE']),
concat(['SET_BOND', 'SET_XOR_VALUE', 'SET_REFERRAL']),
concat([
'SET_BOND',
'SET_XOR_VALUE',
'SET_REFERRAL',
'SET_INVITED_USERS_INFO',
'SET_INVITED_USERS_UPDATES',
'RESET_INVITED_USERS_UPDATES',
'RESET_INVITED_USERS_SUBSCRIPTION',
]),
map((x) => [x, x]),
fromPairs
)(['GET_REFERRAL', 'GET_INVITED_USERS']);
)(['GET_REFERRAL']);

interface ReferralsState {
referral: string;
invitedUsers: Array<string>;
invitedUsers: Nullable<Array<string>>;
invitedUsersUpdates: Nullable<Subscription>;
isBond: boolean;
xorValue: string;
storageReferral: string;
Expand All @@ -25,7 +36,8 @@ interface ReferralsState {
function initialState(): ReferralsState {
return {
referral: '',
invitedUsers: [],
invitedUsers: null,
invitedUsersUpdates: null,
isBond: true,
xorValue: '',
storageReferral: storage.get('storageReferral') || '',
Expand Down Expand Up @@ -60,14 +72,25 @@ const mutations = {
state.referral = '';
},

[types.GET_INVITED_USERS_REQUEST](state: ReferralsState) {
state.invitedUsers = [];
[types.SET_INVITED_USERS_INFO](state: ReferralsState, info: Nullable<Array<string>>) {
state.invitedUsers = info;
},
[types.GET_INVITED_USERS_SUCCESS](state: ReferralsState, invitedUsers: Array<string>) {
state.invitedUsers = invitedUsers;
[types.SET_INVITED_USERS_UPDATES](state: ReferralsState, subscription: Subscription) {
state.invitedUsersUpdates = subscription;
},
[types.GET_INVITED_USERS_FAILURE](state: ReferralsState) {
state.invitedUsers = [];
[types.RESET_INVITED_USERS_UPDATES](state: ReferralsState) {
if (state.invitedUsersUpdates) {
state.invitedUsersUpdates.unsubscribe();
}
state.invitedUsersUpdates = null;
},

[types.RESET_INVITED_USERS_SUBSCRIPTION](state: ReferralsState) {
const s = omit(['invitedUsers', 'invitedUsersUpdates'], initialState());

Object.keys(s).forEach((key) => {
state[key] = s[key];
});
},

[types.SET_BOND](state: ReferralsState, isBond: boolean) {
Expand All @@ -94,14 +117,23 @@ const actions = {
commit(types.GET_REFERRAL_FAILURE);
}
},
async getInvitedUsers({ commit }, referralId: string) {
commit(types.GET_INVITED_USERS_REQUEST);
try {
const invitedUsers = await api.referralSystem.getInvitedUsers(referralId);
commit(types.GET_INVITED_USERS_SUCCESS, invitedUsers);
} catch (error) {
commit(types.GET_INVITED_USERS_FAILURE);
}
async subscribeInvitedUsers({ commit, rootGetters }, referrerId: string) {
commit(types.RESET_INVITED_USERS_UPDATES);

if (!rootGetters.isLoggedIn) return;

const invitedUsersSubscription = api.referralSystem.subscribeOnInvitedUsers(referrerId).subscribe((info) => {
commit(types.SET_INVITED_USERS_INFO, info);
});

commit(types.SET_ACCOUNT_MARKET_MAKER_UPDATES, invitedUsersSubscription);
alexnatalia marked this conversation as resolved.
Show resolved Hide resolved
},
unsubscribeInvitedUsers({ commit }) {
commit(types.RESET_INVITED_USERS_UPDATES);
commit(types.SET_INVITED_USERS_INFO, null);
},
resetInvitedUsersSubscription({ commit }) {
commit(types.RESET_INVITED_USERS_SUBSCRIPTION);
},
setBound({ commit }, isBound: boolean) {
commit(types.SET_BOND, isBound);
Expand Down
72 changes: 45 additions & 27 deletions src/views/ReferralProgram.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,25 @@
{{ t('referralProgram.referralsNumber', { number: invitedUsersNumber }) }}
</h3>
</template>
<info-line
v-for="invitedUser in invitedUsers"
value-can-be-hidden
:key="invitedUser.toString()"
:value="getInvitedUserReward(invitedUser.toString())"
:asset-symbol="xorSymbol"
:fiat-value="getFiatAmountByCodecString(getInvitedUserReward(invitedUser.toString()))"
is-formatted
>
<template #info-line-prefix>
<s-tooltip :content="t('account.copy')">
<span class="info-line-address" @click="handleCopyAddress($event)">
{{ formatRereffalAddress(invitedUser.toString()) }}
</span>
</s-tooltip>
</template>
</info-line>
<template v-if="invitedUsers && invitedUsers.length">
<info-line
v-for="invitedUser in invitedUsers"
value-can-be-hidden
:key="invitedUser.toString()"
:value="getInvitedUserReward(invitedUser.toString())"
:asset-symbol="xorSymbol"
:fiat-value="getFiatAmountByCodecString(getInvitedUserReward(invitedUser.toString()))"
is-formatted
>
<template #info-line-prefix>
<s-tooltip :content="t('account.copy')">
<span class="info-line-address" @click="handleCopyAddress($event)">
{{ formatRereffalAddress(invitedUser.toString()) }}
</span>
</s-tooltip>
</template>
</info-line>
</template>
</s-collapse-item>
</s-collapse>
<s-card
Expand Down Expand Up @@ -107,7 +109,7 @@
</template>
alexnatalia marked this conversation as resolved.
Show resolved Hide resolved

<script lang="ts">
import { Component, Mixins } from 'vue-property-decorator';
import { Component, Mixins, Watch } from 'vue-property-decorator';
import { Action, Getter } from 'vuex-class';
import { components, mixins } from '@soramitsu/soraneo-wallet-web';
import type { CodecString } from '@sora-substrate/util';
Expand Down Expand Up @@ -141,17 +143,29 @@ export default class ReferralProgram extends Mixins(
readonly LogoSize = LogoSize;

@Getter('tokenXOR', { namespace: 'assets' }) tokenXOR!: AccountAsset;
@Getter('invitedUsers', { namespace }) invitedUsers!: Array<string>;
@Getter('invitedUsers', { namespace }) invitedUsers!: Nullable<Array<string>>;

@Action('getInvitedUsers', { namespace }) getInvitedUsers!: (referralId: string) => Promise<void>;
@Action('resetInvitedUsersSubscription', { namespace }) resetInvitedUsersSubscription!: AsyncVoidFn;
@Action('subscribeInvitedUsers', { namespace }) subscribeInvitedUsers!: (referrerId: string) => AsyncVoidFn;
@Action('unsubscribeInvitedUsers', { namespace }) unsubscribeInvitedUsers!: AsyncVoidFn;
@Action('setBound', { namespace }) setBound!: (isBond: boolean) => Promise<void>;

@Watch('isLoggedIn')
@Watch('isSoraAccountConnected')
alexnatalia marked this conversation as resolved.
Show resolved Hide resolved
private async updateSubscriptions(value: boolean) {
if (value) {
await this.subscribeInvitedUsers(this.account?.address);
} else {
await this.unsubscribeInvitedUsers();
}
}

get rewards(): string {
return this.referralRewards?.rewards.toLocaleString() || '0';
}

get xorTokenPrice(): Nullable<CodecString> {
return this.getAssetFiatPrice(this.tokenXOR);
return this.tokenXOR ? this.getAssetFiatPrice(this.tokenXOR) : null;
}

get invitedUserRewards(): any {
Expand All @@ -167,7 +181,7 @@ export default class ReferralProgram extends Mixins(
}

get invitedUsersNumber(): number {
return this.invitedUsers.length;
return this.invitedUsers ? this.invitedUsers.length : 0;
}

get invitedUsersClasses(): Array<string> {
Expand All @@ -183,16 +197,20 @@ export default class ReferralProgram extends Mixins(
get referralLink(): any {
const routerMode = router.mode === 'hash' ? '#/' : '';
return {
href: `${detectBaseUrl(router)}${routerMode}referral/${this.account.address}`,
label: `<span class="referral-link-address">Polkaswap.io/</span>${routerMode}referral/${this.account.address}`,
isVisible: +this.bondedXOR > 0,
href: `${detectBaseUrl(router)}${routerMode}referral/${this.account?.address}`,
label: `<span class="referral-link-address">Polkaswap.io/</span>${routerMode}referral/${this.account?.address}`,
isVisible: this.account && +this.bondedXOR > 0,
};
}

destroyed(): void {
this.resetInvitedUsersSubscription();
}

async created(): Promise<void> {
this.withApi(async () => {
if (this.isSoraAccountConnected) {
await this.getInvitedUsers(this.account.address);
await this.subscribeInvitedUsers(this.account.address);
await this.getAccountReferralRewards();
}
});
Expand All @@ -203,7 +221,7 @@ export default class ReferralProgram extends Mixins(
}

getInvitedUserReward(invitedUser: string): string {
if (this.invitedUserRewards[invitedUser]?.rewards) {
if (typeof invitedUser === 'string' && this.invitedUserRewards[invitedUser]?.rewards) {
return this.formatCodecNumber(this.invitedUserRewards[invitedUser].rewards.toCodecString());
}
return this.formatCodecNumber('0');
Expand Down
60 changes: 30 additions & 30 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,55 +2432,55 @@
resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==

"@sora-substrate/api-derive@^1.7.37":
version "1.7.37"
resolved "https://registry.yarnpkg.com/@sora-substrate/api-derive/-/api-derive-1.7.37.tgz#60db39123f7223156ed5f2760af8f7593b53a1c7"
integrity sha512-hZG4Jn50Jm8eZlwcqPgRQCLuvsk4XJrCZ8sH/I3oWixsK06URljprDpdtSIUwPRMidemNOkUc4jSRYaGIzeK7w==
"@sora-substrate/api-derive@^1.7.41":
version "1.7.41"
resolved "https://registry.yarnpkg.com/@sora-substrate/api-derive/-/api-derive-1.7.41.tgz#47a07932b6478ee71080dc720b1f37ef955cd90f"
integrity sha512-Cfd0YHuUWc7iRDZXr/2poDKbPrSRKl4FUwBQxE/jfmWmO48FKGfweMl1KiRAIaIVpiCci7tINIlShBUSDRUcQQ==
dependencies:
"@babel/runtime" "^7.10.2"
"@polkadot/api-derive" "^4.10.1"
"@sora-substrate/types" "^1.7.37"
"@sora-substrate/types" "^1.7.41"
rxjs "^6.5.5"

"@sora-substrate/api@^1.7.37":
version "1.7.37"
resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.7.37.tgz#c9163d6a4e9d41ca407462843a948f449487eaf0"
integrity sha512-HGPgaOeDSuY8hln+K86OUHD5oR8ouKCOprKbntavMtxHwhoBycBUOaKucH4xoAiC/rcZeDUUsQO7K79R1bRjiA==
"@sora-substrate/api@^1.7.41":
version "1.7.41"
resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.7.41.tgz#347cc7127c919258f49efd5737540db578551494"
integrity sha512-1sd0f+W9zgN/9hD/+VrXxtauEZMGxJM8eA94PMIWp74qrcGftct4/IOEV9EQSK04BAdLZ/5fWDTzyfM8o0Da5w==
dependencies:
"@babel/runtime" "^7.10.2"
"@open-web3/orml-api-derive" "^0.8.2-9"
"@polkadot/api" "^4.10.1"
"@polkadot/rpc-core" "^4.10.1"
"@sora-substrate/api-derive" "^1.7.37"
"@sora-substrate/types" "^1.7.37"
"@sora-substrate/api-derive" "^1.7.41"
"@sora-substrate/types" "^1.7.41"

"@sora-substrate/type-definitions@^1.7.37":
version "1.7.37"
resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.7.37.tgz#a94e4e0496cd9387a66b0c29cc2ccbcce6847e55"
integrity sha512-HFkNB9XCrqv2LjExJx6HKefj6+OZ8uPNs6bDTFdAnf+16+cxKnN/seaTvg0n724gEOo86/1FM16URhO7ldoiVQ==
"@sora-substrate/type-definitions@^1.7.41":
version "1.7.41"
resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.7.41.tgz#1f199c72fa07f94431220c947e963fba84ba1408"
integrity sha512-tkNZzlygLgx29P4/UDwq4SBgGvabb8LJtkf90ns7gJs8Lnp2spytRLlpHjqQeXJP17glI4y+Pm1okmfIrEBx1g==
dependencies:
"@open-web3/orml-type-definitions" "^0.9.4-35"

"@sora-substrate/types@^1.7.37":
version "1.7.37"
resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.7.37.tgz#1c6ac5cb40a84b7f564d4ac3039dc906aa37b877"
integrity sha512-bM7zuuyWvlP4uT3P22opqtPXLT/h1xSYlxqFho3evPB54+/n7tANn8uTUyknlXJ71NqydPPtrIppwqiwwWyJfA==
"@sora-substrate/types@^1.7.41":
version "1.7.41"
resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.7.41.tgz#9b67edafdd3182ec09575d5caa44ed483be39f34"
integrity sha512-VTS9n4k/MIErDy74jgYYdR3vKBWqW3zrWXKNa7+sGaWqBce0y06huvepPP0TUPGkG+SPWoQe93rHR2ZQfi5Smw==
dependencies:
"@babel/runtime" "^7.10.2"
"@open-web3/api-mobx" "^0.8.2-9"
"@open-web3/orml-types" "^0.8.2-9"
"@polkadot/api" "^4.10.1"
"@polkadot/typegen" "^4.10.1"
"@polkadot/types" "^4.10.1"
"@sora-substrate/type-definitions" "^1.7.37"
"@sora-substrate/type-definitions" "^1.7.41"

"@sora-substrate/util@^1.7.37":
version "1.7.37"
resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.7.37.tgz#019182b2e01356c63890b1cac4bc12e6d8c1fc74"
integrity sha512-8Zr9HgEhKSzux9CJrPSOnOSRXYkBiGLth7qUSxAiscu/u18Ey3asKAcP2wW2/IZCOjo+yRCGvy1bGcaqVieybw==
"@sora-substrate/util@^1.7.38":
version "1.7.41"
resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.7.41.tgz#cfc9342806a0e3143a94afedff2478129c466623"
integrity sha512-az2RfSvrVQHnPRr1s3JCUJpFbxY4vu1babpueb0i7vjRSVGbU6NSNwau1x/CbYqfh5dvSXv+WganoctMFd49Pg==
dependencies:
"@polkadot/ui-keyring" "^0.77.1"
"@sora-substrate/api" "^1.7.37"
"@sora-substrate/api" "^1.7.41"
axios "^0.21.1"
bignumber.js "^9.0.1"
crypto-js "^4.0.0"
Expand All @@ -2504,14 +2504,14 @@
vuex "^3.1.3"
vuex-class "^0.3.2"

"@soramitsu/soraneo-wallet-web@^1.7.24":
version "1.7.24"
resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.7.24.tgz#4491c94fa3f911349579d52c5e72eee9417bac8c"
integrity sha512-f6CNymbxAb6NzU3rcYZkPV42cBQnWYfg4QJq58yOsO1ReNuzJrYfs/fD/v0Dvpoo6UT0EGEoh+VMWFctvmXA7w==
"@soramitsu/soraneo-wallet-web@^1.7.25":
version "1.7.25"
resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.7.25.tgz#1258d4c3e10f90bdbfd01f09205bbe5ebfc65fb1"
integrity sha512-xwPRBgeDseksKbBpy2GMyk4TvwBcoHJIs3OfEHLqzwV/N8dCdzF3wKXzxoRpv/u198udpCbN1TffVo3k95bCzQ==
dependencies:
"@polkadot/extension-dapp" "^0.42.2"
"@polkadot/vue-identicon" "^0.72.1"
"@sora-substrate/util" "^1.7.37"
"@sora-substrate/util" "^1.7.38"
"@soramitsu/soramitsu-js-ui" "^1.0.28"
core-js "^3.6.4"
dayjs "^1.10.5"
Expand Down