From 40be251e7b59bbede4351f33e653b8064fb53184 Mon Sep 17 00:00:00 2001
From: Daniel Kmak <kuzirashi@interia.pl>
Date: Thu, 5 Apr 2018 18:56:00 +0200
Subject: [PATCH] [FEATURE] Gas estimation for scheduling

---
 common/components/GasLimitField.tsx           | 12 +++++--
 .../components/AdvancedGas.tsx                |  1 +
 .../Fields/ScheduleGasLimitField.tsx          | 18 ++++++++---
 common/sagas/transaction/network/gas.ts       | 21 ++++++++++--
 spec/sagas/transaction/network/gas.spec.ts    | 32 ++++++++++++++-----
 5 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/common/components/GasLimitField.tsx b/common/components/GasLimitField.tsx
index 92fbc722..34c6857b 100644
--- a/common/components/GasLimitField.tsx
+++ b/common/components/GasLimitField.tsx
@@ -9,9 +9,14 @@ import { Input } from 'components/ui';
 interface Props {
   customLabel?: string;
   disabled?: boolean;
+  hideGasCalculationSpinner?: boolean;
 }
 
-export const GasLimitField: React.SFC<Props> = ({ customLabel, disabled }) => (
+export const GasLimitField: React.SFC<Props> = ({
+  customLabel,
+  disabled,
+  hideGasCalculationSpinner
+}) => (
   <GasLimitFieldFactory
     withProps={({ gasLimit: { raw }, onChange, readOnly, gasEstimationPending }) => (
       <div className="input-group-wrapper">
@@ -19,7 +24,10 @@ export const GasLimitField: React.SFC<Props> = ({ customLabel, disabled }) => (
           <div className="input-group-header">
             {customLabel ? customLabel : translate('TRANS_GAS')}
             <div className="flex-spacer" />
-            <InlineSpinner active={gasEstimationPending} text="Calculating" />
+            <InlineSpinner
+              active={!hideGasCalculationSpinner && gasEstimationPending}
+              text="Calculating"
+            />
           </div>
           <Input
             className={gasLimitValidator(raw) ? 'is-valid' : 'is-invalid'}
diff --git a/common/components/TXMetaDataPanel/components/AdvancedGas.tsx b/common/components/TXMetaDataPanel/components/AdvancedGas.tsx
index 7046af2a..d99b0f4a 100644
--- a/common/components/TXMetaDataPanel/components/AdvancedGas.tsx
+++ b/common/components/TXMetaDataPanel/components/AdvancedGas.tsx
@@ -102,6 +102,7 @@ class AdvancedGas extends React.Component<Props, State> {
               <GasLimitField
                 customLabel={translateRaw('OFFLINE_STEP2_LABEL_4')}
                 disabled={scheduling}
+                hideGasCalculationSpinner={scheduling}
               />
             </div>
           )}
diff --git a/common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleGasLimitField.tsx b/common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleGasLimitField.tsx
index 435e69a6..769c39b6 100644
--- a/common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleGasLimitField.tsx
+++ b/common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleGasLimitField.tsx
@@ -3,12 +3,17 @@ import React from 'react';
 import { AppState } from 'reducers';
 import { setScheduleGasLimitField, TSetScheduleGasLimitField } from 'actions/transaction';
 import { translateRaw } from 'translations';
-import { Input } from 'components/ui';
-import { getScheduleGasLimit, isValidScheduleGasLimit } from 'selectors/transaction';
+import { Input, InlineSpinner } from 'components/ui';
+import {
+  getScheduleGasLimit,
+  isValidScheduleGasLimit,
+  getGasEstimationPending
+} from 'selectors/transaction';
 import { Wei } from 'libs/units';
 import { EAC_SCHEDULING_CONFIG } from 'libs/scheduling';
 
 interface OwnProps {
+  gasEstimationPending: boolean;
   scheduleGasLimit: any;
   validScheduleGasLimit: boolean;
 }
@@ -21,12 +26,16 @@ type Props = OwnProps & DispatchProps;
 
 class ScheduleGasLimitFieldClass extends React.Component<Props> {
   public render() {
-    const { scheduleGasLimit, validScheduleGasLimit } = this.props;
+    const { gasEstimationPending, scheduleGasLimit, validScheduleGasLimit } = this.props;
 
     return (
       <div className="input-group-wrapper">
         <label className="input-group">
-          <div className="input-group-header">{translateRaw('SCHEDULE_GAS_LIMIT')}</div>
+          <div className="input-group-header">
+            {translateRaw('SCHEDULE_GAS_LIMIT')}
+            <div className="flex-spacer" />
+            <InlineSpinner active={gasEstimationPending} text="Calculating" />
+          </div>
           <Input
             className={!!scheduleGasLimit.raw && !validScheduleGasLimit ? 'invalid' : ''}
             type="number"
@@ -51,6 +60,7 @@ class ScheduleGasLimitFieldClass extends React.Component<Props> {
 
 export const ScheduleGasLimitField = connect(
   (state: AppState) => ({
+    gasEstimationPending: getGasEstimationPending(state),
     scheduleGasLimit: getScheduleGasLimit(state),
     validScheduleGasLimit: isValidScheduleGasLimit(state)
   }),
diff --git a/common/sagas/transaction/network/gas.ts b/common/sagas/transaction/network/gas.ts
index 1ef2a414..368af2f0 100644
--- a/common/sagas/transaction/network/gas.ts
+++ b/common/sagas/transaction/network/gas.ts
@@ -15,10 +15,10 @@ import { INode } from 'libs/nodes/INode';
 import { getNodeLib, getOffline, getAutoGasLimitEnabled } from 'selectors/config';
 import { getWalletInst } from 'selectors/wallet';
 import { getTransaction, IGetTransaction, getCurrentToAddressMessage } from 'selectors/transaction';
+import { getSchedulingToggle } from 'containers/Tabs/ScheduleTransaction/selectors/fields';
 import {
   EstimateGasRequestedAction,
   setGasLimitField,
-  estimateGasFailed,
   estimateGasTimedout,
   estimateGasSucceeded,
   TypeKeys,
@@ -27,7 +27,10 @@ import {
   SetDataFieldAction,
   SwapEtherToTokenAction,
   SwapTokenToTokenAction,
-  SwapTokenToEtherAction
+  SwapTokenToEtherAction,
+  SetSchedulingToggleAction,
+  setScheduleGasLimitField,
+  estimateGasFailed
 } from 'actions/transaction';
 import { TypeKeys as ConfigTypeKeys, ToggleAutoGasLimitAction } from 'actions/config';
 import { IWallet } from 'libs/wallet';
@@ -104,7 +107,19 @@ export function* estimateGas(): SagaIterator {
         timeout: call(delay, 10000)
       });
       if (gasLimit) {
-        yield put(setGasLimitField({ raw: gasLimit.toString(), value: gasLimit }));
+        const gasSetOptions = {
+          raw: gasLimit.toString(),
+          value: gasLimit
+        };
+
+        const scheduling: SetSchedulingToggleAction['payload'] = yield select(getSchedulingToggle);
+
+        if (scheduling && scheduling.value) {
+          yield put(setScheduleGasLimitField(gasSetOptions));
+        } else {
+          yield put(setGasLimitField(gasSetOptions));
+        }
+
         yield put(estimateGasSucceeded());
       } else {
         yield put(estimateGasTimedout());
diff --git a/spec/sagas/transaction/network/gas.spec.ts b/spec/sagas/transaction/network/gas.spec.ts
index 2505d68a..4f824f09 100644
--- a/spec/sagas/transaction/network/gas.spec.ts
+++ b/spec/sagas/transaction/network/gas.spec.ts
@@ -4,13 +4,15 @@ import BN from 'bn.js';
 import { getNodeLib, getOffline, getAutoGasLimitEnabled } from 'selectors/config';
 import { getWalletInst } from 'selectors/wallet';
 import { getTransaction, getCurrentToAddressMessage } from 'selectors/transaction';
+import { getSchedulingToggle } from 'containers/Tabs/ScheduleTransaction/selectors/fields';
 import {
   setGasLimitField,
   estimateGasFailed,
   estimateGasSucceeded,
   TypeKeys,
   estimateGasRequested,
-  estimateGasTimedout
+  estimateGasTimedout,
+  setScheduleGasLimitField
 } from 'actions/transaction';
 import { makeTransaction, getTransactionFields } from 'libs/transaction';
 import {
@@ -113,6 +115,10 @@ describe('estimateGas*', () => {
   const unsuccessfulGasEstimationResult = {
     gasLimit: null
   };
+  const gasSetOptions = {
+    raw: gasLimit.toString(),
+    value: gasLimit
+  };
 
   const gens: { [name: string]: any } = {};
   gens.successCase = cloneableGenerator(estimateGas)();
@@ -175,15 +181,25 @@ describe('estimateGas*', () => {
     );
   });
 
-  it('should put setGasLimitField', () => {
+  it('should select getSchedulingToggle', () => {
     gens.timeOutCase = gens.successCase.clone();
     expect(gens.successCase.next(successfulGasEstimationResult).value).toEqual(
-      put(
-        setGasLimitField({
-          raw: gasLimit.toString(),
-          value: gasLimit
-        })
-      )
+      select(getSchedulingToggle)
+    );
+  });
+
+  it('should put setGasLimitField', () => {
+    gens.scheduleCase = gens.successCase.clone();
+    const notScheduling = null as any;
+    expect(gens.successCase.next(notScheduling).value).toEqual(
+      put(setGasLimitField(gasSetOptions))
+    );
+  });
+
+  it('should put setScheduleGasLimitField', () => {
+    const scheduling = { value: true } as any;
+    expect(gens.scheduleCase.next(scheduling).value).toEqual(
+      put(setScheduleGasLimitField(gasSetOptions))
     );
   });