Merge branch 'OP-172-Label-changing-for-deactivation-scaffold's-event' into 'sprint'

OP-172 - Label changing for deactivation scaffold's event

See merge request open-platform/api!168

Author: Ruslan Molchanov

frontend/src/components/ShareHolderSave.js

@@ -42,7 +42,7 @@ class ShareHolderSaveComponent extends React.Component {
   };
 
   onAddressChange = e => this.setState({ address: e.target.value });
-  onShareChange = e => this.setState({ share: Math.abs(e.target.value) });
+  onShareChange = e => this.setState({ share: Math.abs(e.target.value) || '' });
   onAddressBlur = () => this.setState({ isAddressErrorVisible: true });
 
   onShowHandler = () => {

frontend/src/components/TransactionEvent.js

@@ -32,20 +32,24 @@ export const TransactionEvent = ({
     transactionAmount,
     scaffoldTransactionIndex
   }
-}) => (
-  <div>
-    <b>{date ? formatDate(date) : null}</b> <i>{type.replace(/_/g, ' ')}</i>
+}) => {
+  const resultType = type === 'ACTIVATED_SCAFFOLD' ? 'DEACTIVATED_SCAFFOLD' : type;
+  return (
     <div>
-      {renderAddress('User Address', userAddress)}
-      {renderAddress('to Address', toAddress)}
-      {renderAddress('Customer Address', customerAddress)}
-      {activated ? <TransactionParam>Activated: {activated}</TransactionParam> : null}
-      {partnerShare ? <TransactionParam>Partner Share: {partnerShare}%</TransactionParam> : null}
-      {amount ? <TransactionParam>Amount: {amount}%</TransactionParam> : null}
-      {transactionAmount ? <TransactionParam>Transaction Amount: {transactionAmount}%</TransactionParam> : null}
-      {scaffoldTransactionIndex ? (
-        <TransactionParam>Transaction Index: {scaffoldTransactionIndex}%</TransactionParam>
-      ) : null}
+      {/* <b>{date ? formatDate(date, DD_MMM_YYYY + ' HH:MM') : null}</b> <i>{resultType.replace(/_/g, ' ')}</i> */}
+      <b>{date ? formatDate(date) : null}</b> <i>{resultType.replace(/_/g, ' ')}</i>
+      <div>
+        {renderAddress('User Address', userAddress)}
+        {renderAddress('to Address', toAddress)}
+        {renderAddress('Customer Address', customerAddress)}
+        {activated ? <TransactionParam>Activated: {activated}</TransactionParam> : null}
+        {partnerShare ? <TransactionParam>Partner Share: {partnerShare}%</TransactionParam> : null}
+        {amount ? <TransactionParam>Amount: {amount}%</TransactionParam> : null}
+        {transactionAmount ? <TransactionParam>Transaction Amount: {transactionAmount}%</TransactionParam> : null}
+        {scaffoldTransactionIndex ? (
+          <TransactionParam>Transaction Index: {scaffoldTransactionIndex}%</TransactionParam>
+        ) : null}
+      </div>
     </div>
-  </div>
-);
+  );
+};