rename callData to paylaod

rainbow-me · Feb 7, 2019 · 990db5b · 990db5b
1 parent fe0a7ac
commit 990db5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/redux/transactionsToApprove.js b/src/redux/transactionsToApprove.js
@@ -76,7 +76,7 @@ const getRequestDisplayDetails = (payload, assets, prices, nativeCurrency) => {
 const getTypedDataDisplayDetails = (request) => {
   const timestampInMs = Date.now();
   return {
-    callData: request,
+    payload: request,
     timestampInMs,
     type: 'message',
   };
@@ -85,7 +85,7 @@ const getTypedDataDisplayDetails = (request) => {
 const getMessageDisplayDetails = (message) => {
   const timestampInMs = Date.now();
   return {
-    callData: message,
+    payload: message,
     timestampInMs,
     type: 'message',
   };
@@ -98,7 +98,7 @@ const getTransactionDisplayDetails = (transaction, assets, prices, nativeCurrenc
     const value = fromWei(convertHexToString(transaction.value));
     const { nativeAmount, nativeAmountDisplay } = getNativeAmount(prices, nativeCurrency, value, 'ETH');
     return {
-      callData: {
+      payload: {
         asset: {
           address: null,
           decimals: 18,
@@ -127,7 +127,7 @@ const getTransactionDisplayDetails = (transaction, assets, prices, nativeCurrenc
     const value = fromWei(convertHexToString(amount), asset.decimals);
     const { nativeAmount, nativeAmountDisplay } = getNativeAmount(prices, nativeCurrency, value, asset.symbol);
     return {
-      callData: {
+      payload: {
         asset,
         from: transaction.from,
         gasLimit: BigNumber(convertHexToString(transaction.gasLimit)),

diff --git a/src/screens/TransactionConfirmationScreenWithData.js b/src/screens/TransactionConfirmationScreenWithData.js
@@ -48,13 +48,13 @@ class TransactionConfirmationScreenWithData extends Component {
     const maxTxnCount = Math.max(this.props.transactionCountNonce, web3TxnCount);
     const nonce = web3Instance.utils.toHex(maxTxnCount);
     const txPayloadLatestNonce = { ...txPayload, nonce };
-    const symbol = get(transactionDetails, 'transactionDisplayDetails.callData.asset.symbol', 'unknown');
-    const address = get(transactionDetails, 'transactionDisplayDetails.callData.asset.address', '');
+    const symbol = get(transactionDetails, 'transactionDisplayDetails.payload.asset.symbol', 'unknown');
+    const address = get(transactionDetails, 'transactionDisplayDetails.payload.asset.address', '');
     const trackingName = `${symbol}:${address}`;
     const transactionHash = await sendTransaction({
       tracking: {
         action: 'send-wc',
-        amount: get(transactionDetails, 'transactionDisplayDetails.callData.nativeAmount'),
+        amount: get(transactionDetails, 'transactionDisplayDetails.payload.nativeAmount'),
         name: trackingName,
       },
       transaction: txPayloadLatestNonce,
@@ -63,14 +63,14 @@ class TransactionConfirmationScreenWithData extends Component {
     if (transactionHash) {
       this.props.updateTransactionCountNonce(maxTxnCount + 1);
       const txDetails = {
-        asset: get(transactionDetails, 'transactionDisplayDetails.callData.asset'),
-        from: get(transactionDetails, 'transactionDisplayDetails.callData.from'),
-        gasLimit: get(transactionDetails, 'transactionDisplayDetails.callData.gasLimit'),
-        gasPrice: get(transactionDetails, 'transactionDisplayDetails.callData.gasPrice'),
+        asset: get(transactionDetails, 'transactionDisplayDetails.payload.asset'),
+        from: get(transactionDetails, 'transactionDisplayDetails.payload.from'),
+        gasLimit: get(transactionDetails, 'transactionDisplayDetails.payload.gasLimit'),
+        gasPrice: get(transactionDetails, 'transactionDisplayDetails.payload.gasPrice'),
         hash: transactionHash,
-        nonce: get(transactionDetails, 'transactionDisplayDetails.callData.nonce'),
-        to: get(transactionDetails, 'transactionDisplayDetails.callData.to'),
-        value: get(transactionDetails, 'transactionDisplayDetails.callData.value'),
+        nonce: get(transactionDetails, 'transactionDisplayDetails.payload.nonce'),
+        to: get(transactionDetails, 'transactionDisplayDetails.payload.to'),
+        value: get(transactionDetails, 'transactionDisplayDetails.payload.value'),
       };
       this.props.transactionsAddNewTransaction(txDetails);
       this.props.removeTransaction(transactionDetails.requestId);
@@ -83,7 +83,7 @@ class TransactionConfirmationScreenWithData extends Component {
 
   handleSignMessage = async () => {
     const { transactionDetails } = this.props.navigation.state.params;
-    const message = get(transactionDetails, 'transactionDisplayDetails.callData');
+    const message = get(transactionDetails, 'transactionDisplayDetails.payload');
     const flatFormatSignature = await signMessage(message);
 
     if (flatFormatSignature) {
@@ -128,15 +128,15 @@ class TransactionConfirmationScreenWithData extends Component {
         dappName,
         transactionDisplayDetails: {
           type,
-          callData,
+          payload,
         },
       },
     } = this.props.navigation.state.params;
 
     return (
       <TransactionConfirmationScreen
         dappName={dappName || ''}
-        request={callData}
+        request={payload}
         requestType={type}
         onCancelTransaction={this.handleCancelTransaction}
         onConfirm={this.handleConfirm}