feat: ✨ accounting

pages/tools.tsx

@@ -2,12 +2,14 @@ import React from 'react';
 import { GridWrapper } from 'src/components/gridWrapper/GridWrapper';
 import { withApollo } from 'config/client';
 import { Bakery } from 'src/views/tools/bakery/Bakery';
+import { Accounting } from 'src/views/tools/accounting/Accounting';
 import { BackupsView } from '../src/views/tools/backups/Backups';
 import { MessagesView } from '../src/views/tools/messages/Messages';
 import { WalletVersion } from '../src/views/tools/WalletVersion';
 
 const ToolsView = () => (
   <>
+    <Accounting />
     <BackupsView />
     <MessagesView />
     <Bakery />

server/schema/bos/resolvers.ts

@@ -1,10 +1,13 @@
 import { ContextType } from 'server/types/apiTypes';
 import { getLnd } from 'server/helpers/helpers';
-import { rebalance } from 'balanceofsatoshis/swaps';
 import { to } from 'server/helpers/async';
 import { logger } from 'server/helpers/logger';
 import { AuthType } from 'src/context/AccountContext';
 
+import { rebalance } from 'balanceofsatoshis/swaps';
+import { getAccountingReport } from 'balanceofsatoshis/balances';
+import request from '@alexbosworth/request';
+
 type RebalanceType = {
   auth: AuthType;
   avoid?: String[];
@@ -19,21 +22,79 @@ type RebalanceType = {
   target?: Number;
 };
 
+type AccountingType = {
+  auth: AuthType;
+  category?: String;
+  currency?: String;
+  fiat?: String;
+  month?: String;
+  year?: String;
+};
+
 export const bosResolvers = {
+  Query: {
+    getAccountingReport: async (
+      _: undefined,
+      params: AccountingType,
+      context: ContextType
+    ) => {
+      const { auth, ...settings } = params;
+      const lnd = getLnd(auth, context);
+
+      const response = await to(
+        getAccountingReport({
+          lnd,
+          logger,
+          request,
+          is_csv: true,
+          ...settings,
+        })
+      );
+
+      return response;
+    },
+  },
   Mutation: {
     bosRebalance: async (
       _: undefined,
       params: RebalanceType,
       context: ContextType
     ) => {
-      const { auth, ...extraparams } = params;
+      const {
+        auth,
+        avoid,
+        in_through,
+        is_avoiding_high_inbound,
+        max_fee,
+        max_fee_rate,
+        max_rebalance,
+        node,
+        out_channels,
+        out_through,
+        target,
+      } = params;
       const lnd = getLnd(auth, context);
 
+      const filteredParams = {
+        ...(avoid.length > 0 && { avoid }),
+        ...(in_through && { in_through }),
+        ...(is_avoiding_high_inbound && { is_avoiding_high_inbound }),
+        ...(max_fee > 0 && { max_fee }),
+        ...(max_fee_rate > 0 && { max_fee_rate }),
+        ...(max_rebalance > 0 && { max_rebalance }),
+        ...(node && { node }),
+        ...(out_channels.length > 0 && { out_channels }),
+        ...(out_through && { out_through }),
+        ...(target && { target }),
+      };
+
+      logger.info('Rebalance Params: %o', filteredParams);
+
       const response = await to(
         rebalance({
           lnd,
           logger,
-          ...extraparams,
+          ...filteredParams,
         })
       );
 

server/schema/types.ts

@@ -36,6 +36,14 @@ export const generalTypes = gql`
 
 export const queryTypes = gql`
   type Query {
+    getAccountingReport(
+      auth: authType!
+      category: String
+      currency: String
+      fiat: String
+      month: String
+      year: String
+    ): String!
     getVolumeHealth(auth: authType!): channelsHealth
     getTimeHealth(auth: authType!): channelsTimeHealth
     getFeeHealth(auth: authType!): channelsFeeHealth

server/tests/__mocks__/balanceofsatoshis/balances.ts

@@ -0,0 +1,3 @@
+export const getAccountingReport = jest
+  .fn()
+  .mockReturnValue(Promise.resolve({}));

src/components/buttons/multiButton/MultiButton.tsx

@@ -21,6 +21,7 @@ const StyledSingleButton = styled.button<StyledSingleProps>`
   background-color: transparent;
   color: ${multiSelectColor};
   flex-grow: 1;
+  transition: background-color 0.5s ease;
 
   ${({ selected, buttonColor }) =>
     selected

src/graphql/queries/getAccountingReport.ts

@@ -0,0 +1,21 @@
+import gql from 'graphql-tag';
+
+export const GET_ACCOUNTING_REPORT = gql`
+  query GetAccountingReport(
+    $auth: authType!
+    $category: String
+    $currency: String
+    $fiat: String
+    $month: String
+    $year: String
+  ) {
+    getAccountingReport(
+      auth: $auth
+      category: $category
+      currency: $currency
+      fiat: $fiat
+      month: $month
+      year: $year
+    )
+  }
+`;

src/graphql/types.ts

@@ -45,6 +45,7 @@ export type PermissionsType = {
 
 export type Query = {
   __typename?: 'Query';
+  getAccountingReport: Scalars['String'];
   getVolumeHealth?: Maybe<ChannelsHealth>;
   getTimeHealth?: Maybe<ChannelsTimeHealth>;
   getFeeHealth?: Maybe<ChannelsFeeHealth>;
@@ -90,6 +91,15 @@ export type Query = {
   getLatestVersion?: Maybe<Scalars['String']>;
 };
 
+export type QueryGetAccountingReportArgs = {
+  auth: AuthType;
+  category?: Maybe<Scalars['String']>;
+  currency?: Maybe<Scalars['String']>;
+  fiat?: Maybe<Scalars['String']>;
+  month?: Maybe<Scalars['String']>;
+  year?: Maybe<Scalars['String']>;
+};
+
 export type QueryGetVolumeHealthArgs = {
   auth: AuthType;
 };

src/utils/helpers.tsx

@@ -93,12 +93,16 @@ export const getPercent = (
   return Math.round(percent);
 };
 
-export const saveToPc = (jsonData: string, filename: string) => {
+export const saveToPc = (
+  jsonData: string,
+  filename: string,
+  isCsv?: boolean
+) => {
   const fileData = jsonData;
   const blob = new Blob([fileData], { type: 'text/plain' });
   const url = URL.createObjectURL(blob);
   const link = document.createElement('a');
-  link.download = `${filename}.txt`;
+  link.download = isCsv ? `${filename}.csv` : `${filename}.txt`;
   link.href = url;
   link.click();
 };

src/views/balance/AdvancedBalance.tsx

@@ -231,7 +231,7 @@ export const AdvancedBalance = () => {
           {hasAvoid ? <Minus size={18} /> : <Plus size={18} />}
         </ColorButton>
       </SettingLine>
-      <SettingLine title={'In Through Channel'}>
+      <SettingLine title={'Decrease Inbound Of'}>
         {hasInChannel ? (
           <RebalanceTag>{state.in_through.alias}</RebalanceTag>
         ) : null}
@@ -247,7 +247,7 @@ export const AdvancedBalance = () => {
         </ColorButton>
       </SettingLine>
       {!hasOutChannels && (
-        <SettingLine title={'Out Through Channel'}>
+        <SettingLine title={'Increase Inbound Of'}>
           {hasOutChannel ? (
             <RebalanceTag>{state.out_through.alias}</RebalanceTag>
           ) : null}
@@ -427,7 +427,14 @@ export const AdvancedBalance = () => {
           </BetaNotification>
           <InputWithDeco title={'Type'} noInput={true}>
             <MultiButton>
-              {renderButton(() => isDetailedSet(false), 'Auto', !isDetailed)}
+              {renderButton(
+                () => {
+                  dispatch({ type: 'clearFilters' });
+                  isDetailedSet(false);
+                },
+                'Auto',
+                !isDetailed
+              )}
               {renderButton(() => isDetailedSet(true), 'Detailed', isDetailed)}
             </MultiButton>
           </InputWithDeco>

src/views/tools/Tools.styled.tsx

@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+import { ResponsiveLine } from 'src/components/generic/Styled';
 
 export const NoWrap = styled.div`
   margin-right: 16px;
@@ -22,3 +23,7 @@ export const Column = styled.div`
   justify-content: center;
   align-items: center;
 `;
+
+export const ToolsResponsiveLine = styled(ResponsiveLine)`
+  margin-bottom: 8px;
+`;

src/views/tools/WalletVersion.tsx

@@ -7,6 +7,7 @@ import {
   Card,
   Sub4Title,
   Separation,
+  DarkSubTitle,
 } from '../../components/generic/Styled';
 import { useStatusState } from '../../context/StatusContext';
 import { LoadingCard } from '../../components/loading/LoadingCard';
@@ -30,7 +31,10 @@ export const WalletVersion = () => {
     if (minorVersion < 10) {
       return (
         <Card>
-          Update to LND version 0.10.0 or higher to see your wallet build info.
+          <DarkSubTitle>
+            Update to LND version 0.10.0 or higher to see your wallet build
+            info.
+          </DarkSubTitle>
         </Card>
       );
     }