Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

fix: removed support for inactive games" #806

Merged
merged 26 commits into from Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8a4c650
feat: adds good-ghosting integration to zapper
meetkosiso Jun 3, 2022
d4a70a6
fix: adds games type to axios fetch, filtered games response accordi…
meetkosiso Jun 3, 2022
6939302
feat: adds support for CELO and bug fixes
meetkosiso Jun 14, 2022
4f1a17c
feat: adds support for CELO and bug fixes
meetkosiso Jun 14, 2022
7a3e9ae
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
3f7843c
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
9bf59af
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
3041894
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
6da61ef
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
1bfa300
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
f26995c
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
d363d2c
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
3f956d5
feat: adds support for Celo and bug fixes
meetkosiso Jun 14, 2022
06e8267
Merge branch 'main' into good-ghosting-integration
meetkosiso Jun 14, 2022
536b2a2
fix: show only incentives for winners
meetkosiso Jun 14, 2022
87ef8a5
fix: removed support for inactive games
meetkosiso Jun 30, 2022
6689716
fix: merge conflict fixes
meetkosiso Jun 30, 2022
1dc9275
fix: merge conflict marker removed
meetkosiso Jun 30, 2022
e6f3e98
fix: removed merge conflict marker
meetkosiso Jun 30, 2022
5c0c466
fix: removed duplicates imports
meetkosiso Jun 30, 2022
dfb2d66
fix: resolved type issues
meetkosiso Jun 30, 2022
0bb909e
fix: resolved type issues
meetkosiso Jun 30, 2022
65681ef
fix: resolved type issues
meetkosiso Jun 30, 2022
834319c
fix: resolved type issues
meetkosiso Jun 30, 2022
6caf75c
fix: removed unnecessary dependencies
meetkosiso Jun 30, 2022
0e0234d
Merge branch 'main' into good-ghosting-integration
meetkosiso Jun 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,5 +1,5 @@
import { Inject } from '@nestjs/common';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { Register } from '~app-toolkit/decorators';
import { presentBalanceFetcherResponse } from '~app-toolkit/helpers/presentation/balance-fetcher-response.present';
import { BalanceFetcher } from '~balance/balance-fetcher.interface';
Expand Down
@@ -1,12 +1,16 @@
import { Inject } from '@nestjs/common';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';

import { Register } from '~app-toolkit/decorators';
import { PositionFetcher } from '~position/position-fetcher.interface';
import { ContractPosition } from '~position/position.interface';
import { Network } from '~types/network.interface';

import { GOOD_GHOSTING_DEFINITION } from '../good-ghosting.definition';
import { NetworkId } from '../helpers/constants';
import { GoodGhostingContractFactory } from '../contracts';

import { GoodGhostingGameContractPositionFetcherHelper } from '../helpers/good-ghosting.game.contract-position-fetcher-helper';

const appId = GOOD_GHOSTING_DEFINITION.id;
Expand All @@ -17,6 +21,8 @@ const networkId = NetworkId.CeloMainnet;
@Register.ContractPositionFetcher({ appId, groupId, network })
export class CeloGoodGhostingGameContractPositionFetcher implements PositionFetcher<ContractPosition> {
constructor(
@Inject(GoodGhostingContractFactory) private readonly goodGhostingContractFactory: GoodGhostingContractFactory,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comments, remove unnecessary dependencies.


@Inject(GoodGhostingGameContractPositionFetcherHelper)
private readonly helper: GoodGhostingGameContractPositionFetcherHelper,
) {}
Expand Down
Expand Up @@ -3,10 +3,13 @@ import { BigNumber } from 'ethers';
import { sumBy, compact } from 'lodash';

import { drillBalance } from '~app-toolkit';

import { ContractPositionBalance } from '~position/position-balance.interface';
import { APP_TOOLKIT, IAppToolkit } from '~app-toolkit/app-toolkit.interface';
import { getAppImg } from '~app-toolkit/helpers/presentation/image.present';

import { ContractType } from '~position/contract.interface';
import { ContractPositionBalance } from '~position/position-balance.interface';
import { getAppImg } from '~app-toolkit/helpers/presentation/image.present';

import { isClaimable, isSupplied } from '~position/position.utils';
import { Network } from '~types/network.interface';

Expand Down Expand Up @@ -87,7 +90,22 @@ export class GoodGhostingBalanceFetcherHelper {
}

if (player.withdrawn) {
balance = BigNumber.from(0);
const balancePositionWithdrawn: ContractPositionBalance = {
type: ContractType.POSITION,
network,
address: contractPosition.address,
appId,
groupId,
tokens: [],
balanceUSD: 0,
dataProps: {},
displayProps: {
label: appId,
images: [getAppImg(appId)],
},
};

return balancePositionWithdrawn;
}

const stakedTokenBalance = drillBalance(stakedToken, amountPaid.toString());
Expand Down