From 98b22a06093b767e540745ac051cf48298da40a4 Mon Sep 17 00:00:00 2001 From: immasandwich Date: Tue, 26 Apr 2022 22:15:52 -0400 Subject: [PATCH] fix: Lido merge conflicts and linting (#285) --- src/apps/lido/ethereum/lido.steth.token-fetcher.ts | 6 +++--- src/apps/lido/ethereum/lido.wsteth.token-fetcher.ts | 6 +++--- src/apps/lido/lido.module.ts | 8 +++----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/apps/lido/ethereum/lido.steth.token-fetcher.ts b/src/apps/lido/ethereum/lido.steth.token-fetcher.ts index 9dd8729f2..1aff6e830 100644 --- a/src/apps/lido/ethereum/lido.steth.token-fetcher.ts +++ b/src/apps/lido/ethereum/lido.steth.token-fetcher.ts @@ -2,12 +2,12 @@ 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 { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present'; +import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present'; import { ContractType } from '~position/contract.interface'; +import { PositionFetcher } from '~position/position-fetcher.interface'; import { AppTokenPosition } from '~position/position.interface'; import { Network } from '~types/network.interface'; -import { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present'; -import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present'; import { LidoContractFactory } from '../contracts'; import { LIDO_DEFINITION } from '../lido.definition'; diff --git a/src/apps/lido/ethereum/lido.wsteth.token-fetcher.ts b/src/apps/lido/ethereum/lido.wsteth.token-fetcher.ts index ccb9b0f27..1d1c27f82 100644 --- a/src/apps/lido/ethereum/lido.wsteth.token-fetcher.ts +++ b/src/apps/lido/ethereum/lido.wsteth.token-fetcher.ts @@ -2,12 +2,12 @@ import { Inject } from '@nestjs/common'; import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface'; import { Register } from '~app-toolkit/decorators'; +import { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present'; +import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present'; +import { ContractType } from '~position/contract.interface'; import { PositionFetcher } from '~position/position-fetcher.interface'; import { AppTokenPosition } from '~position/position.interface'; -import { ContractType } from '~position/contract.interface'; import { Network } from '~types/network.interface'; -import { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present'; -import { getTokenImg } from '~app-toolkit/helpers/presentation/image.present'; import { LidoContractFactory } from '../contracts'; import { LIDO_DEFINITION } from '../lido.definition'; diff --git a/src/apps/lido/lido.module.ts b/src/apps/lido/lido.module.ts index 6c62a6f07..2318ac5b0 100644 --- a/src/apps/lido/lido.module.ts +++ b/src/apps/lido/lido.module.ts @@ -1,12 +1,11 @@ import { Module } from '@nestjs/common'; -import { AbstractDynamicApp } from '~app/app.dynamic-module'; +import { AbstractApp } from '~app/app.dynamic-module'; import { LidoContractFactory } from './contracts'; -import { EthereumLidoBalanceFetcher } from './ethereum/lido.balance-fetcher'; import { EthereumLidoStethTokenFetcher } from './ethereum/lido.steth.token-fetcher'; -import { EthereumLidoWstethTokenFetcher } from './ethereum/lido.wsteth.token-fetcher'; import { EthereumLidoTvlFetcher } from './ethereum/lido.tvl-fetcher'; +import { EthereumLidoWstethTokenFetcher } from './ethereum/lido.wsteth.token-fetcher'; import { LidoAppDefinition } from './lido.definition'; @Module({ @@ -14,9 +13,8 @@ import { LidoAppDefinition } from './lido.definition'; LidoAppDefinition, LidoContractFactory, EthereumLidoTvlFetcher, - EthereumLidoBalanceFetcher, EthereumLidoStethTokenFetcher, EthereumLidoWstethTokenFetcher, ], }) -export class LidoAppModule extends AbstractDynamicApp() {} +export class LidoAppModule extends AbstractApp() {}