Merge pull request #640 from Cryptonomic/patch/a1

contract deployment bug

Author: anonymoussprocket

app/components/ActionPanel/index.js

@@ -150,7 +150,7 @@ class ActionPanel extends Component<Props, State> {
         return (
           <Delegate
             isReady={ready}
-            address={selectedAccount.get('delegate') || selectedAccountHash}
+            address={selectedAccount.get('delegate')}
             selectedAccountHash={selectedAccountHash}
             selectedParentHash={selectedParentHash}
           />

app/components/Delegate/index.js

@@ -1,5 +1,5 @@
 // @flow
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { bindActionCreators, compose } from 'redux';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
@@ -23,7 +23,7 @@ import {
 type Props = {
   selectedAccountHash?: string,
   selectedParentHash?: string,
-  address?: string,
+  address?: string | null,
   delegate?: () => {},
   fetchDelegationAverageFees: () => {},
   getIsReveal: () => {},
@@ -108,24 +108,6 @@ const SetADelegate = styled.div`
   margin-bottom: 14px;
   color: ${({ theme: { colors } }) => colors.black2};
 `;
-const WarningContainer = styled.div`
-  height: 91px;
-  width: 60%;
-  border: solid 1px rgba(148, 169, 209, 0.49);
-  border-radius: 3px;
-  background-color: ${({ theme: { colors } }) => colors.light};
-  display: flex;
-  align-items: center;
-  padding: 0 19px;
-  margin-right: 5%;
-`;
-const InfoText = styled.div`
-  color: ${({ theme: { colors } }) => colors.primary};
-  font-size: 16px;
-  letter-spacing: 0.7px;
-  margin-left: 11px;
-  line-height: 21px;
-`;
 
 const initialState = {
   open: false,
@@ -200,12 +182,6 @@ class Delegate extends Component<Props> {
   handleFeeChange = fee => this.setState({ fee });
   setIsLoading = isLoading => this.setState({ isLoading });
 
-  getAddress = () => {
-    const { tempAddress } = this.state;
-    const { address } = this.props;
-    return tempAddress || address;
-  };
-
   onDelegate = async () => {
     const { password, fee, tempAddress } = this.state;
     const {
@@ -287,33 +263,29 @@ class Delegate extends Component<Props> {
       <Container>
         <Title>{t('components.delegate.delegate_settings')}</Title>
         <DelegateContainer>
-          {address && (
-            <DelegateInputContainer>
-              <SetADelegate>
-                {t('components.delegate.current_delegate')}:
-              </SetADelegate>
-              <TezosAddress
-                address={address}
-                size="16px"
-                color="primary"
-                color2="index0"
-              />
-              <UpdateButton
-                disabled={isLoading}
-                onClick={this.openConfirmation}
-                buttonTheme="secondary"
-                small
-              >
-                {t('components.delegate.change_delegate')}
-              </UpdateButton>
-            </DelegateInputContainer>
-          )}
-          {!address && (
-            <WarningContainer>
-              <TezosIcon iconName="info" size={ms(5)} color="info" />
-              <InfoText>{t('components.delegate.delegate_warning')}</InfoText>
-            </WarningContainer>
-          )}
+          <DelegateInputContainer>
+            {!!address && (
+              <Fragment>
+                <SetADelegate>
+                  {t('components.delegate.current_delegate')}:
+                </SetADelegate>
+                <TezosAddress
+                  address={address}
+                  size="16px"
+                  color="primary"
+                  color2="index0"
+                />
+              </Fragment>
+            )}
+            <UpdateButton
+              disabled={isLoading}
+              onClick={this.openConfirmation}
+              buttonTheme="secondary"
+              small
+            >
+              {t('components.delegate.change_delegate')}
+            </UpdateButton>
+          </DelegateInputContainer>
           <DelegationTipsContainer>
             <DelegationTitle>
               {t('components.addressBlock.delegation_tips')}
@@ -359,6 +331,10 @@ class Delegate extends Component<Props> {
   }
 }
 
+Delegate.defaultProps = {
+  address: ''
+};
+
 function mapStateToProps(state) {
   return {
     isLedger: getIsLedger(state)

app/components/DelegateConfirmationModal/index.js

@@ -1,5 +1,5 @@
 // @flow
-import React from 'react';
+import React, { Fragment } from 'react';
 import { Trans } from 'react-i18next';
 import styled from 'styled-components';
 import Modal from '../CustomModal';
@@ -15,7 +15,8 @@ import { wrapComponent } from '../../utils/i18n';
 import Tooltip from '../Tooltip/';
 
 const ModalContainer = styled.div`
-  padding: 43px 76px 0 76px;
+  padding: ${({ isAddress }) =>
+    isAddress ? '43px 76px 0 76px' : '10px 76px 0 76px'};
 `;
 const DelegateTitle = styled.div`
   color: ${({ theme: { colors } }) => colors.gray5};
@@ -118,7 +119,7 @@ const BoldSpan = styled.span`
 type Props = {
   onEnterPress: () => {},
   open?: boolean,
-  address: string,
+  address: string | null,
   newAddress?: string,
   password?: string,
   fee?: number,
@@ -189,18 +190,22 @@ const DelegateConfirmationModal = (props: Props) => {
       style={{ width: '651px' }}
       onKeyDown={onEnterPress}
     >
-      <ModalContainer>
-        <DelegateTitle>
-          {t('components.delegate.current_delegate')}
-        </DelegateTitle>
-        <AddressContainer>
-          <TezosAddress
-            address={address}
-            size="16px"
-            color="primary"
-            color2="index0"
-          />
-        </AddressContainer>
+      <ModalContainer isAddress={!!address}>
+        {!!address && (
+          <Fragment>
+            <DelegateTitle>
+              {t('components.delegate.current_delegate')}
+            </DelegateTitle>
+            <AddressContainer>
+              <TezosAddress
+                address={address}
+                size="16px"
+                color="primary"
+                color2="index0"
+              />
+            </AddressContainer>
+          </Fragment>
+        )}
         <InputAddressContainer>
           <InputAddress
             labelText={t(

app/components/InteractContractModal/DeployContract.js

@@ -53,14 +53,14 @@ const defaultState = {
   gas: 0,
   storage: 0,
   fee: 50000,
-  amount: '',
+  amount: '0',
   parameters: '',
   passPhrase: '',
   isShowedPwd: false,
   isOpenLedgerConfirm: false,
   michelsonCode: '',
   delegate: '',
-  codeFormat: ''
+  codeFormat: 'micheline'
 };
 
 class DeployContract extends Component<Props> {
@@ -179,7 +179,7 @@ class DeployContract extends Component<Props> {
           <InputAddressContainer>
             <CustomTextArea
               label={t('components.interactModal.paste_micheline_code', {
-                format: codeFormat || 'micheline'
+                format: codeFormat
               })}
               multiline
               rows={5}

app/components/InteractContractModal/InvokeContract.js

@@ -52,12 +52,12 @@ const defaultState = {
   gas: 0,
   storage: 0,
   fee: 50000,
-  amount: '',
+  amount: '0',
   parameters: '',
   passPhrase: '',
   isShowedPwd: false,
   isOpenLedgerConfirm: false,
-  codeFormat: '',
+  codeFormat: 'micheline',
   entryPoint: ''
 };
 

app/components/Invoke/index.js

@@ -148,12 +148,12 @@ const initialState = {
   selectedInvokeAddress: '',
   gas: 0,
   storage: 0,
-  amount: '',
+  amount: '0',
   parameters: '',
   passPhrase: '',
   isShowedPwd: false,
   isOpenLedgerConfirm: false,
-  codeFormat: ''
+  codeFormat: 'micheline'
 };
 
 class Invoke extends Component<Props> {

app/reduxContent/originate/thunks.js

@@ -105,7 +105,7 @@ export function originateContract(
         url,
         userKeyStore,
         amountInUtez,
-        delegate,
+        delegate.length > 0 ? delegate : undefined,
         fee,
         userDerivation,
         storageLimit,
@@ -135,8 +135,6 @@ export function originateContract(
       });
     }
 
-    console.log('newAddress results-----', newAddress);
-
     if (newAddress) {
       const operationResult1 =
         newAddress &&