Ensure only Errors are thrown/rejected

Whenever using the `throw` keyword or calling `reject` in a Promise, the value passed should be an Error. Various tools expect thrown "errors" to be errors; this is the convention. Using Error types is also more useful for debugging, as they have stack traces.
MetaMask · Mar 6, 2020 · f9072c1 · f9072c1
1 parent 1353086
commit f9072c1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js
@@ -1651,7 +1651,7 @@ export class BrowserTab extends PureComponent {
 		this.setState({ showApprovalDialog: false, showApprovalDialogHostname: undefined });
 		this.approvalRequest &&
 			this.approvalRequest.reject &&
-			this.approvalRequest.reject('User rejected account access');
+			this.approvalRequest.reject(new Error('User rejected account access'));
 	};
 
 	renderApprovalModal = () => {

diff --git a/app/components/Views/ImportWallet/index.js b/app/components/Views/ImportWallet/index.js
@@ -172,7 +172,7 @@ class ImportWallet extends PureComponent {
 		} catch (e) {
 			if (!firstAttempt) {
 				this.props.navigation.goBack();
-				if (e.toString() === 'sync-timeout') {
+				if (e.message === 'Sync::timeout') {
 					Alert.alert(
 						strings('sync_with_extension.outdated_qr_code'),
 						strings('sync_with_extension.outdated_qr_code_desc')

diff --git a/app/components/Views/SyncWithExtension/index.js b/app/components/Views/SyncWithExtension/index.js
@@ -151,7 +151,7 @@ class SyncWithExtension extends PureComponent {
 		} catch (e) {
 			if (!firstAttempt) {
 				this.props.navigation.goBack();
-				if (e.toString() === 'sync-timeout') {
+				if (e.message === 'Sync::timeout') {
 					Alert.alert(
 						strings('sync_with_extension.outdated_qr_code'),
 						strings('sync_with_extension.outdated_qr_code_desc')

diff --git a/app/core/WalletConnect.js b/app/core/WalletConnect.js
@@ -283,7 +283,7 @@ class WalletConnect {
 			});
 			hub.on('walletconnectSessionRequest::rejected', peerId => {
 				if (peerInfo.peerId === peerId) {
-					reject(false);
+					reject(new Error('walletconnectSessionRequest::rejected'));
 				}
 			});
 		});

diff --git a/app/util/blockies.js b/app/util/blockies.js
@@ -325,7 +325,7 @@
 
 	function buildOpts(opts) {
 		if (!opts.seed) {
-			throw 'No seed provided';
+			throw new Error('No seed provided');
 		}
 
 		seedrand(opts.seed);

diff --git a/app/util/syncWithExtension.js b/app/util/syncWithExtension.js
@@ -59,8 +59,9 @@ export default class PubNubWrapper {
 				() => {
 					setTimeout(() => {
 						if (this.timeout) {
-							Logger.error('Sync::timeout');
-							reject('sync-timeout');
+							const error = new Error('Sync::timeout');
+							Logger.error(error);
+							reject(error);
 						} else {
 							resolve();
 						}