From 746fa127c3016dea681f0153247e0eb5f3ad2d11 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 21 Mar 2019 16:26:33 -0300 Subject: [PATCH 1/5] wip: showing plain transaction error on screen alert --- app/components/Views/Send/index.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index cbd6047bfb62..99ad57c63872 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -249,8 +249,16 @@ class Send extends Component { transaction = this.prepareAssetTransaction(transaction, selectedAsset); } const { result, transactionMeta } = await TransactionController.addTransaction(transaction); + await TransactionController.approveTransaction(transactionMeta.id); - await result; + try { + await result; + } catch (e) { + // + } + if (transactionMeta.error) { + throw transactionMeta.error.message; + } this.removeCollectible(); this.setState({ transactionConfirmed: false, transactionSubmitted: true }); this.props.navigation.pop(); @@ -258,7 +266,8 @@ class Send extends Component { TransactionsNotificationManager.watchSubmittedTransaction(transactionMeta); }); } catch (error) { - Alert.alert('Transaction error', JSON.stringify(error), [{ text: 'OK' }]); + const errorToShow = error.toString().replace('Error: ', ''); + Alert.alert('Transaction error', errorToShow, [{ text: 'OK' }]); this.setState({ transactionConfirmed: false }); await this.reset(); } From 81d983c10d8bdc70e6bc5fdbd82f17380f1a6c89 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 21 Mar 2019 17:03:05 -0300 Subject: [PATCH 2/5] handle result promise --- app/components/Views/Approval/index.js | 2 +- app/components/Views/Send/index.js | 13 +++++-------- package-lock.json | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/components/Views/Approval/index.js b/app/components/Views/Approval/index.js index 8232ecccf7db..f88dfb4e9865 100644 --- a/app/components/Views/Approval/index.js +++ b/app/components/Views/Approval/index.js @@ -95,7 +95,7 @@ class Approval extends Component { await TransactionController.updateTransaction(updatedTx); await TransactionController.approveTransaction(transaction.id); } catch (error) { - Alert.alert('Transaction error', JSON.stringify(error), [{ text: 'OK' }]); + Alert.alert('Transaction error', error.message, [{ text: 'OK' }]); this.setState({ transactionHandled: false }); } }; diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index 99ad57c63872..9d1922f6f76d 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -251,13 +251,11 @@ class Send extends Component { const { result, transactionMeta } = await TransactionController.addTransaction(transaction); await TransactionController.approveTransaction(transactionMeta.id); - try { - await result; - } catch (e) { - // - } + await new Promise(resolve => { + resolve(result); + }); if (transactionMeta.error) { - throw transactionMeta.error.message; + throw transactionMeta.erroßr; } this.removeCollectible(); this.setState({ transactionConfirmed: false, transactionSubmitted: true }); @@ -266,8 +264,7 @@ class Send extends Component { TransactionsNotificationManager.watchSubmittedTransaction(transactionMeta); }); } catch (error) { - const errorToShow = error.toString().replace('Error: ', ''); - Alert.alert('Transaction error', errorToShow, [{ text: 'OK' }]); + Alert.alert('Transaction error', error.message, [{ text: 'OK' }]); this.setState({ transactionConfirmed: false }); await this.reset(); } diff --git a/package-lock.json b/package-lock.json index 7a55d1ba0438..2f4b87e3ebe5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18006,8 +18006,8 @@ "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d84a96796079c8595a0c78accd1e7709f2277215", "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { - "bn.js": "^4.10.0", - "ethereumjs-util": "^5.0.0" + "bn.js": "^4.11.8", + "ethereumjs-util": "^6.0.0" }, "dependencies": { "ethereumjs-util": { From d51072cf66a2b0e608d0cc9146e2f894e15c0f85 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 21 Mar 2019 17:10:54 -0300 Subject: [PATCH 3/5] remove listener in approval --- app/components/Views/Approval/index.js | 1 + app/components/Views/Send/index.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/components/Views/Approval/index.js b/app/components/Views/Approval/index.js index f88dfb4e9865..6b01b428510c 100644 --- a/app/components/Views/Approval/index.js +++ b/app/components/Views/Approval/index.js @@ -56,6 +56,7 @@ class Approval extends Component { if (!transactionHandled) { Engine.context.TransactionController.cancelTransaction(transaction.id); } + Engine.context.TransactionController.hub.removeAllListeners(`${transaction.id}:finished`); this.clear(); }; diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index 9d1922f6f76d..1f3da019a5fa 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -255,7 +255,7 @@ class Send extends Component { resolve(result); }); if (transactionMeta.error) { - throw transactionMeta.erroßr; + throw transactionMeta.error; } this.removeCollectible(); this.setState({ transactionConfirmed: false, transactionSubmitted: true }); From d3e8648f0592439c94a29b5b978563a4ed91b860 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Thu, 21 Mar 2019 17:17:51 -0300 Subject: [PATCH 4/5] drop package-lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f4b87e3ebe5..7a55d1ba0438 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18006,8 +18006,8 @@ "version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#d84a96796079c8595a0c78accd1e7709f2277215", "from": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "requires": { - "bn.js": "^4.11.8", - "ethereumjs-util": "^6.0.0" + "bn.js": "^4.10.0", + "ethereumjs-util": "^5.0.0" }, "dependencies": { "ethereumjs-util": { From 45481e10c65002cfa68796952676543d581d9045 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Fri, 22 Mar 2019 20:27:25 -0300 Subject: [PATCH 5/5] comments --- app/components/Views/Approval/index.js | 2 +- app/components/Views/Send/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Views/Approval/index.js b/app/components/Views/Approval/index.js index 6b01b428510c..b82660f7cf51 100644 --- a/app/components/Views/Approval/index.js +++ b/app/components/Views/Approval/index.js @@ -96,7 +96,7 @@ class Approval extends Component { await TransactionController.updateTransaction(updatedTx); await TransactionController.approveTransaction(transaction.id); } catch (error) { - Alert.alert('Transaction error', error.message, [{ text: 'OK' }]); + Alert.alert('Transaction error', error && error.message, [{ text: 'OK' }]); this.setState({ transactionHandled: false }); } }; diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index 1f3da019a5fa..ee82052a958b 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -264,7 +264,7 @@ class Send extends Component { TransactionsNotificationManager.watchSubmittedTransaction(transactionMeta); }); } catch (error) { - Alert.alert('Transaction error', error.message, [{ text: 'OK' }]); + Alert.alert('Transaction error', error && error.message, [{ text: 'OK' }]); this.setState({ transactionConfirmed: false }); await this.reset(); }