transfer amount details returned (for UX purposes)

mikhaildobs · mikhaildobs · commit 8bce39f02b71 · 2017-09-15T12:07:04.000Z
diff --git a/server.js b/server.js
@@ -43,9 +43,10 @@ app.use('/hello/', function(req, res) {
 
 // redirect to github pages
 app.use('/', function(req, res) {
-    log.debug("redirecting request : ", req.url);
-    res.writeHead(302, {'Location': 'https://eth2phone.github.io'});
-    res.end();
+    // log.debug("redirecting request : ", req.url);
+    // res.writeHead(302, {'Location': 'https://eth2phone.github.io'});
+    // res.end();
+    res.redirect('https://eth2phone.github.io'+req.url)
 });
 
 
@@ -93,7 +94,7 @@ if (config.get('HTTPS_ON')) {
 
     // redirect to https
     app.get('*',function(req,res){
-	res.redirect('https://eth2phone.com'+req.url)
+	res.redirect('https://eth2phone.github.io'+req.url)
     })
 
     const portNum = config.get('port');    
diff --git a/src/controllers/ReceiverController.js b/src/controllers/ReceiverController.js
@@ -78,7 +78,7 @@ function* confirm(req, res) {
 	throw new BadRequestError('Please provide valid signature (s)');
     };
 
-    yield VeriedProxyContractService.checkTransferStatusBeforeWithdraw(transferId);
+    const transferBc = yield VeriedProxyContractService.checkTransferStatusBeforeWithdraw(transferId);
     
     // check that signature is valid    
     signatureValid = yield VeriedProxyContractService.checkSignature(transferId,
@@ -91,7 +91,7 @@ function* confirm(req, res) {
     const pendingTxHash = yield VeriedProxyContractService.withdraw(transferId,
 								    to, v, r, s);
 
-    res.json({success: true, pendingTxHash})
+    res.json({success: true, pendingTxHash, amount: transferBc.amount })
 }
 
 
diff --git a/src/services/VeriedProxyContractService.js b/src/services/VeriedProxyContractService.js
@@ -47,7 +47,7 @@ function* getByTransferId(transferId) {
 	    id: data[0].toString(),
 	    status: data[1].toNumber(),
 	    from: data[2].toString('hex'),
-	    amount: data[3].toNumber(),
+	    amount: web3.fromWei(data[3], 'ether').toString(10),
 	    blocknumber: data[4].toNumber()
 	};
     }
@@ -73,7 +73,7 @@ function* checkTransferStatusBeforeWithdraw(transferId) {
 	    throw new BadRequestError("Transfer can't be received! Transfer status: " + transferBc.status);
 	}
     }
-    return true;
+    return transferBc;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ function* getByTransferId(transferId) {`
`47`	`47`	`id: data[0].toString(),`
`48`	`48`	`status: data[1].toNumber(),`
`49`	`49`	`from: data[2].toString('hex'),`
`50`		`- amount: data[3].toNumber(),`
	`50`	`+ amount: web3.fromWei(data[3], 'ether').toString(10),`
`51`	`51`	`blocknumber: data[4].toNumber()`
`52`	`52`	`};`
`53`	`53`	`}`
`@@ -73,7 +73,7 @@ function* checkTransferStatusBeforeWithdraw(transferId) {`
`73`	`73`	`throw new BadRequestError("Transfer can't be received! Transfer status: " + transferBc.status);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`- return true;`
	`76`	`+ return transferBc;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`