Skip to content

Commit

Permalink
Merge pull request #117 from Peersyst/fix/remove-give-away
Browse files Browse the repository at this point in the history
Remove giveaway and fix amount parsing
  • Loading branch information
JordiParraCrespo authored Nov 19, 2024
2 parents 4b92557 + 49beaf9 commit 125e2bc
Show file tree
Hide file tree
Showing 17 changed files with 20 additions and 327 deletions.
1 change: 0 additions & 1 deletion packages/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"@tanstack/react-query": "^5.40.0",
"@transak/transak-sdk": "^3.1.2",
"babel-plugin-styled-components": "^2.0.7",
"canvas-confetti": "^1.9.3",
"clsx": "^1.2.1",
"decimal.js": "^10.4.3",
"i18next": "^23.11.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { GiveAwayRepositoryErrorCodes } from '../give-away/GiveAwayRepositoryErrorCodes';
import { MetaMaskErrorCodes } from '../metamask/MetaMaskErrorCodes';
import { FundErrorCodes } from '../xrpl/FundErrorCodes';
import { XrplErrorCodes } from '../xrpl/XrplErrorCodes';
Expand All @@ -8,7 +7,6 @@ const RepositoryErrorCodes = {
...MetaMaskErrorCodes,
...FundErrorCodes,
...XrplErrorCodes,
...GiveAwayRepositoryErrorCodes,
};

export type RepositoryErrorCode = keyof typeof RepositoryErrorCodes;
Expand Down

This file was deleted.

This file was deleted.

31 changes: 18 additions & 13 deletions packages/site/src/data-access/repository/xrpl/XrplService.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { TokenWithBalance } from 'common/models';
import Amount from 'common/utils/Amount';
import RepositoryErrorCodes from 'data-access/repository/error/RepositoryErrorCodes';
import Decimal from 'decimal.js';
import { AccountNFTsResponse, AccountTxResponse, Client, TxResponse } from 'xrpl';

import RepositoryError from '../error/RepositoryError';
Expand Down Expand Up @@ -126,19 +127,23 @@ export class XrplService {
lines.push(...res.result.lines);
}

return lines.map((line) => {
const token = {
currency: line.currency,
issuer: line.account,
decimals: 15,
};
const [int, dec] = line.balance?.split('.') || [];

return {
...token,
balance: Amount.fromDecToken(dec ? `${int}.${dec.slice(0, 14)}` : int, token),
};
});
const tokenWithBalances: TokenWithBalance[] = [];

for (const line of lines) {
try {
const token = {
currency: line.currency,
issuer: line.account,
decimals: 15,
};
tokenWithBalances.push({
...token,
balance: Amount.fromDecToken(new Decimal(line.balance).toFixed(14), token),
});
} catch {}
}

return tokenWithBalances;
} catch (e) {
return [];
}
Expand Down
3 changes: 0 additions & 3 deletions packages/site/src/domain/adapter/RepositoryFactory.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { TokenRepository } from 'data-access/repository/token/TokenRepository';

import Factory from '../../common/utils/Factory';
import { GiveAwayRepository } from '../../data-access/repository/give-away/GiveAwayRepository';
import { MetaMaskRepository } from '../../data-access/repository/metamask/MetaMaskRepository';
import { FundRepository } from '../../data-access/repository/xrpl/FundRepository';
import { XrplService } from '../../data-access/repository/xrpl/XrplService';
Expand All @@ -11,13 +10,11 @@ export type IRepositoryFactory = {
tokenRepository: TokenRepository;
fundRepository: FundRepository;
xrplService: XrplService;
giveAwayRepository: GiveAwayRepository;
};

export default Factory<IRepositoryFactory>({
metamaskRepository: () => new MetaMaskRepository(),
tokenRepository: () => new TokenRepository(),
fundRepository: () => new FundRepository(),
xrplService: () => new XrplService(),
giveAwayRepository: () => new GiveAwayRepository(),
});
9 changes: 0 additions & 9 deletions packages/site/src/domain/give-away/GiveAwayController.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/site/src/ui/adapter/ControllerFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import SnapController from 'domain/snap/controller/SnapController';
import { TokenController } from 'domain/token/TokenController';

import RepositoryFactory from '../../domain/adapter/RepositoryFactory';
import { GiveAwayController } from '../../domain/give-away/GiveAwayController';
import { NftController } from '../../domain/nft/controller/NftController';
import snapState from '../../domain/snap/state/snapState';
import TransactionController from '../../domain/transaction/controller/TransactionController';
Expand All @@ -18,7 +17,6 @@ export type IControllerFactory = {
transactionController: TransactionController;
tokenController: TokenController;
nftController: NftController;
giveAwayController: GiveAwayController;
};

export default Factory<IControllerFactory>({
Expand All @@ -36,5 +34,4 @@ export default Factory<IControllerFactory>({
transactionController: () => new TransactionController(RepositoryFactory.metamaskRepository, RepositoryFactory.xrplService),
tokenController: () => new TokenController(RepositoryFactory.tokenRepository),
nftController: () => new NftController(RepositoryFactory.xrplService),
giveAwayController: () => new GiveAwayController(RepositoryFactory.giveAwayRepository),
});

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions packages/site/src/ui/giveaway/query/useGetPromoCode.ts

This file was deleted.

Loading

0 comments on commit 125e2bc

Please sign in to comment.