chore(new-issuer): fix merge conflicts

Author: BilalAlGhazi

packages/new-polymath-issuer/src/components/DividendCard/DividendCard.tsx

@@ -17,6 +17,7 @@ import {
   ButtonFluid,
 } from '@polymathnetwork/new-ui';
 import { DIVIDEND_PAYMENT_INVESTOR_BATCH_SIZE } from '~/constants';
+import * as sc from './styles';
 
 interface Props {
   dividend: types.DividendEntity;
@@ -88,9 +89,9 @@ export const DividendCard: FC<Props> = ({
             {formatters.toTokens(dividend.amount)} {currencyLabel}
           </Paragraph>
         </CardPrimary>
-        <Heading mt="m" mb={1}>
+        <sc.DividendHeading mt="m" mb={1}>
           {dividend.name}
-        </Heading>
+        </sc.DividendHeading>
         <Label color={currencyColor} bg={currencyBgColor}>
           Issued in {currencyType}
         </Label>

packages/new-polymath-issuer/src/components/DividendCard/styles.ts

@@ -0,0 +1,12 @@
+import { styled, Heading, ThemeInterface } from '@polymathnetwork/new-ui';
+import { StyledComponent } from 'styled-components';
+
+export const DividendHeading: StyledComponent<
+  typeof Heading,
+  ThemeInterface,
+  any,
+  'variant'
+> = styled(Heading)`
+  width: 100%;
+  word-wrap: break-word;
+`;

packages/new-polymath-issuer/src/pages/DividendDetails/Presenter.tsx

@@ -243,7 +243,7 @@ export const Presenter = ({
                   <Box ml="m">
                     <Text color="highlightText" fontSize={6} fontWeight={0}>
                       {formatters.toPercent(
-                        1 - pendingTransactions / totalTransactions
+                        1 - pendingTransactions / (totalTransactions || 1)
                       )}
                     </Text>
                     <Paragraph>Transactions are completed</Paragraph>

packages/new-polymath-issuer/src/pages/DividendsWizard/Container.tsx

@@ -6,6 +6,8 @@ import { DataFetcher } from '~/components/enhancers/DataFetcher';
 import {
   createTaxWithholdingListBySymbolAndCheckpointFetcher,
   createCheckpointBySymbolAndIdFetcher,
+  createCheckpointsBySymbolFetcher,
+  createDividendsByCheckpointFetcher,
 } from '~/state/fetchers';
 import { types, formatters, utils } from '@polymathnetwork/new-shared';
 import { DateTime } from 'luxon';
@@ -17,13 +19,15 @@ import { ActionType } from 'typesafe-actions';
 import { DividendModuleTypes } from '@polymathnetwork/sdk';
 import { BigNumber } from 'bignumber.js';
 import { Page } from '@polymathnetwork/new-ui';
-import { range, padStart } from 'lodash';
+import { range, padStart, flatten, map, every, values } from 'lodash';
 import { polyClient } from '~/lib/polyClient';
 import { GetErc20BalanceByAddressAndWalletArgs } from '~/types';
+import { push } from 'redux-little-router';
 
 const actions = {
   updateTaxWithholdingListStart,
   createErc20DividendDistributionStart,
+  push,
 };
 
 export interface Props {
@@ -203,48 +207,109 @@ export class ContainerBase extends Component<Props, State> {
 
   public render() {
     const { securityTokenSymbol, checkpointIndex } = this.props;
+    const fetcher = createCheckpointsBySymbolFetcher({
+      securityTokenSymbol,
+    });
+
     const { step } = this.state;
     const parsedCheckpointIndex = parseInt(checkpointIndex, 10);
     return (
       <Page title="Create New Dividend Distribution">
         <DataFetcher
           watchProps={this.state}
-          fetchers={[
-            createTaxWithholdingListBySymbolAndCheckpointFetcher({
-              securityTokenSymbol,
-              checkpointIndex: parsedCheckpointIndex,
-              dividendType: DividendModuleTypes.Erc20,
-            }),
-            createCheckpointBySymbolAndIdFetcher({
-              securityTokenSymbol,
-              checkpointIndex: parsedCheckpointIndex,
-            }),
-          ]}
-          render={(
-            {
-              taxWithholdings,
-              checkpoints: [checkpoint],
-            }: {
-              taxWithholdings: types.TaxWithholdingEntity[];
-              checkpoints: types.CheckpointEntity[];
-            },
-            loading: boolean
-          ) => {
+          fetchers={[fetcher]}
+          render={(data: { checkpoints: types.CheckpointEntity[] }) => {
+            const { checkpoints } = data;
+            const fetchers = checkpoints.map(({ index }) =>
+              createDividendsByCheckpointFetcher(
+                {
+                  securityTokenSymbol,
+                  checkpointIndex: index,
+                },
+                { propKey: `${index}` }
+              )
+            );
             return (
-              <Presenter
-                createDividendDistribution={this.createDividendDistribution}
-                updateTaxWithholdingList={this.updateTaxWithholdingList}
-                stepIndex={step}
-                securityTokenSymbol={securityTokenSymbol}
-                checkpoint={checkpoint}
-                onNextStep={this.nextStep}
-                onPreviousStep={this.previousStep}
-                taxWithholdings={taxWithholdings}
-                downloadTaxWithholdingList={this.downloadTaxWithholdingList}
-                downloadSampleExclusionList={this.downloadSampleExclusionList}
-                fetchBalance={this.fetchBalance}
-                fetchIsValidToken={this.fetchIsValidToken}
-                isLoadingData={loading}
+              <DataFetcher
+                watchProps={this.state}
+                fetchers={fetchers}
+                render={(dividendsData: {
+                  [key: string]: types.DividendEntity[];
+                }) => {
+                  const dividends = flatten(values(dividendsData));
+                  const isCompleted = map(dividends, dividend => {
+                    const { expiry, investors } = dividend;
+                    const remainingPayments = investors.filter(
+                      (investor: any) =>
+                        !investor.paymentReceived && !investor.excluded
+                    ).length;
+
+                    return expiry <= new Date() || remainingPayments === 0;
+                  });
+                  const allDividendsCompleted = every(
+                    isCompleted,
+                    (complete: boolean) => complete
+                  );
+
+                  if (!allDividendsCompleted) {
+                    // There are dividends with pending distribution
+                    const { dispatch } = this.props;
+                    const dividendsListUrl = `/securityTokens/${securityTokenSymbol}/dividends`;
+                    dispatch(push(dividendsListUrl));
+                  }
+                  return (
+                    <DataFetcher
+                      watchProps={this.state}
+                      fetchers={[
+                        createTaxWithholdingListBySymbolAndCheckpointFetcher({
+                          securityTokenSymbol,
+                          checkpointIndex: parsedCheckpointIndex,
+                          dividendType: DividendModuleTypes.Erc20,
+                        }),
+                        createCheckpointBySymbolAndIdFetcher({
+                          securityTokenSymbol,
+                          checkpointIndex: parsedCheckpointIndex,
+                        }),
+                      ]}
+                      render={(
+                        {
+                          taxWithholdings,
+                          checkpoints: [checkpoint],
+                        }: {
+                          taxWithholdings: types.TaxWithholdingEntity[];
+                          checkpoints: types.CheckpointEntity[];
+                        },
+                        loading: boolean
+                      ) => {
+                        return (
+                          <Presenter
+                            createDividendDistribution={
+                              this.createDividendDistribution
+                            }
+                            updateTaxWithholdingList={
+                              this.updateTaxWithholdingList
+                            }
+                            stepIndex={step}
+                            securityTokenSymbol={securityTokenSymbol}
+                            checkpoint={checkpoint}
+                            onNextStep={this.nextStep}
+                            onPreviousStep={this.previousStep}
+                            taxWithholdings={taxWithholdings}
+                            downloadTaxWithholdingList={
+                              this.downloadTaxWithholdingList
+                            }
+                            downloadSampleExclusionList={
+                              this.downloadSampleExclusionList
+                            }
+                            fetchBalance={this.fetchBalance}
+                            fetchIsValidToken={this.fetchIsValidToken}
+                            isLoadingData={loading}
+                          />
+                        );
+                      }}
+                    />
+                  );
+                }}
               />
             );
           }}

packages/new-polymath-issuer/src/pages/DividendsWizard/Step-1/index.tsx

@@ -82,7 +82,7 @@ export const Step1: FC<Step1Props> = ({
             via a CSV which includes one wallet (ETH) address per line.
           </Paragraph>
           <Paragraph>
-            You can download
+            You can download{' '}
             <LinkButton onClick={downloadSampleExclusionList}>
               <Icon Asset={icons.SvgDownload} /> Sample-Exclusion-List.csv
             </LinkButton>{' '}
@@ -148,6 +148,7 @@ export const Step1: FC<Step1Props> = ({
                     ],
                     header: true,
                     maxRows: 100,
+                    strict: true,
                     validateFile,
                     customValidationErrorMessage: {
                       header: 'Duplicate Entries',

packages/new-polymath-issuer/src/pages/DividendsWizard/Step-2/TaxWithholdingModal.tsx

@@ -22,13 +22,15 @@ interface Props {
   onClose: () => void;
   taxWithholdingData?: TaxWithholdingsItem;
   fieldProps: FieldProps<any>;
+  exclusionList: string[];
 }
 
 export const TaxWithholdingModal: FC<Props> = ({
   isOpen,
   onClose,
   isEditing,
   fieldProps,
+  exclusionList,
 }) => {
   const { field, form } = fieldProps;
   const isValid = !get(form.errors, field.name);
@@ -52,34 +54,46 @@ export const TaxWithholdingModal: FC<Props> = ({
 
     const valueAddress = value[csvEthAddressKey].toUpperCase();
 
-    const matchingIndex = findIndex(
-      formTaxWithholdings,
-      taxWithholding =>
-        taxWithholding[csvEthAddressKey].toUpperCase() === valueAddress
-    );
+    // Check if excluded
+    const excluded = exclusionList.find(address => {
+      return address.toUpperCase() === valueAddress;
+    });
 
-    const alreadyExists = matchingIndex !== -1;
+    if (!excluded) {
+      // Check if the address already exists in the tax withholding list
+      // if it is a new address, add it to list, otherwise if the address
+      // exists or if the user is editing an existing address, replace the
+      // item from the array with the new item.
+      const matchingIndex = findIndex(
+        formTaxWithholdings,
+        taxWithholding =>
+          taxWithholding[csvEthAddressKey].toUpperCase() === valueAddress
+      );
 
-    if (isEditing || alreadyExists) {
-      const finalValue = { ...value };
+      const alreadyExists = matchingIndex !== -1;
 
-      formTaxWithholdings.splice(matchingIndex, 1, finalValue);
-      form.setFieldValue('taxWithholdings', formTaxWithholdings);
-    } else {
       const finalValue = { ...value };
-
-      form.setFieldValue('taxWithholdings', [
-        ...formTaxWithholdings,
-        finalValue,
-      ]);
+      if (isEditing || alreadyExists) {
+        formTaxWithholdings.splice(matchingIndex, 1, finalValue);
+        form.setFieldValue('taxWithholdings', formTaxWithholdings);
+      } else {
+        form.setFieldValue('taxWithholdings', [
+          ...formTaxWithholdings,
+          finalValue,
+        ]);
+      }
+      form.setFieldValue(field.name, {
+        [csvTaxWithholdingKey]: null,
+        [csvEthAddressKey]: '',
+      });
+      form.setFieldTouched(field.name, false);
+      onClose();
+    } else {
+      form.setFieldError(
+        'currentTaxWithholding.Investor ETH Address',
+        'This address was excluded in the previous step'
+      );
     }
-
-    form.setFieldValue(field.name, {
-      [csvTaxWithholdingKey]: null,
-      [csvEthAddressKey]: '',
-    });
-    form.setFieldTouched(field.name, false);
-    onClose();
   };
 
   // NOTE @RafaelVidaurre: Workaround to avoid broken dirty-checking
@@ -100,7 +114,6 @@ export const TaxWithholdingModal: FC<Props> = ({
     },
     [isOpen]
   );
-
   return (
     <ModalConfirm
       isOpen={isOpen}