From f735a9aa3d525148240416b94f0e5aec5fad058d Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 4 Apr 2019 17:56:13 -0400 Subject: [PATCH 1/5] fix asset removal --- app/components/UI/Collectibles/index.js | 9 +++- app/components/UI/Tokens/index.js | 6 ++- locales/en.json | 4 ++ locales/es.json | 4 ++ package-lock.json | 60 ++++++++++++++----------- package.json | 2 +- 6 files changed, 55 insertions(+), 30 deletions(-) diff --git a/app/components/UI/Collectibles/index.js b/app/components/UI/Collectibles/index.js index 490aec26b38c..24256d3fa450 100644 --- a/app/components/UI/Collectibles/index.js +++ b/app/components/UI/Collectibles/index.js @@ -1,12 +1,13 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { ScrollView, RefreshControl, FlatList, StyleSheet, Text, View } from 'react-native'; +import { Alert, ScrollView, RefreshControl, FlatList, StyleSheet, Text, View } from 'react-native'; import { colors, fontStyles } from '../../../styles/common'; import { strings } from '../../../../locales/i18n'; import ActionSheet from 'react-native-actionsheet'; import Engine from '../../../core/Engine'; import CollectibleImage from '../CollectibleImage'; import AssetElement from '../AssetElement'; +import { toChecksumAddress } from 'ethereumjs-util'; const styles = StyleSheet.create({ wrapper: { @@ -109,7 +110,11 @@ export default class Collectibles extends Component { removeCollectible = () => { const { AssetsController } = Engine.context; - AssetsController.removeCollectible(this.collectibleToRemove.address, this.collectibleToRemove.tokenId); + AssetsController.removeCollectible( + toChecksumAddress(this.collectibleToRemove.address), + this.collectibleToRemove.tokenId + ); + Alert.alert(strings('wallet.collectible_removed_title'), strings('wallet.collectible_removed_desc')); }; createActionSheetRef = ref => { diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js index f299e15ebf09..0be82b10c1be 100644 --- a/app/components/UI/Tokens/index.js +++ b/app/components/UI/Tokens/index.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import { Image, TouchableOpacity, StyleSheet, Text, View } from 'react-native'; +import { Alert, Image, TouchableOpacity, StyleSheet, Text, View } from 'react-native'; import TokenImage from '../TokenImage'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import { colors, fontStyles } from '../../../styles/common'; @@ -11,6 +11,7 @@ import { renderFromTokenMinimalUnit, balanceToFiat } from '../../../util/number' import Engine from '../../../core/Engine'; import AssetElement from '../AssetElement'; import FadeIn from 'react-native-fade-in-image'; +import { toChecksumAddress } from 'ethereumjs-util'; const styles = StyleSheet.create({ wrapper: { @@ -184,7 +185,8 @@ export default class Tokens extends PureComponent { removeToken = () => { const { AssetsController } = Engine.context; - AssetsController.removeToken(this.tokenToRemove.address); + AssetsController.removeToken(toChecksumAddress(this.tokenToRemove.address)); + Alert.alert(strings('wallet.token_removed_title'), strings('wallet.token_removed_desc')); }; createActionSheetRef = ref => { diff --git a/locales/en.json b/locales/en.json index 646eb8841975..981844e3e0c6 100644 --- a/locales/en.json +++ b/locales/en.json @@ -118,6 +118,10 @@ "copy_address": "Copy", "remove_token_title": "Do you want to remove this token?", "remove_collectible_title": "Do you want to remove this collectible?", + "token_removed_title": "Token removed!", + "token_removed_desc": "If you change your mind, you can add it back by tapping on \"Add Token\"", + "collectible_removed_title": "Collectible removed!", + "collectible_removed_desc": "If you change your mind, you can add it back by tapping on \"Add Collectible\"", "remove": "Remove", "cancel": "Cancel" }, diff --git a/locales/es.json b/locales/es.json index e7963a37a00c..9c17ffe8326b 100644 --- a/locales/es.json +++ b/locales/es.json @@ -118,6 +118,10 @@ "copy_address": "Copiar", "remove_token_title": "Deseas eliminar este token?", "remove_collectible_title": "Deseas eliminar este coleccionable?", + "token_removed_title": "Token eliminado!", + "token_removed_desc": "Si cambias de opinión, puedes agregarlo nuevamente presionando en \"Agregar Token\"", + "collectible_removed_title": "Coleccionable eliminado!", + "collectible_removed_desc": "Si cambias de opinión, puedes agregarlo nuevamente presionando en \"Agregar Coleccionable\"", "remove": "Eliminar", "cancel": "Cancelar" }, diff --git a/package-lock.json b/package-lock.json index 749aa9e85898..5d55f6a54c5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6210,7 +6210,7 @@ "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz", "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=", "requires": { - "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#572d4bafe08a8a231137e1f9daeb0f8a23f197d2", + "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "ethereumjs-util": "^5.1.1" } }, @@ -7456,7 +7456,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7474,11 +7475,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7491,15 +7494,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7602,7 +7608,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7612,6 +7619,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7624,17 +7632,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7651,6 +7662,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7723,7 +7735,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7733,6 +7746,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7808,7 +7822,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7838,6 +7853,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7855,6 +7871,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7893,11 +7910,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -7971,9 +7990,8 @@ } }, "gaba": { - "version": "1.0.0-beta.68", - "resolved": "https://registry.npmjs.org/gaba/-/gaba-1.0.0-beta.68.tgz", - "integrity": "sha512-1qZ0sn5qd/FnPyLimzL8gNEe54qyyMuVADKduB7fCmDI6FrZG7sfAGJTuHvKu1zp9c4kd00XNrlCzgqAoQB1BA==", + "version": "file:../gaba/dist/gaba-1.0.0-beta.68.tgz", + "integrity": "sha512-Qf0X39m4yGAkOiuO4m6ofit4D40OKdkWMp1W4l4oAqTpp1cQAkQCkFDUg6R9VV/kP9hyrI/6dP2FFbB4OlECiA==", "requires": { "await-semaphore": "^0.1.3", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31", @@ -8001,14 +8019,6 @@ "version": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31", "from": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31" }, - "eth-method-registry": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eth-method-registry/-/eth-method-registry-1.1.0.tgz", - "integrity": "sha512-jGbbGYd19XJCtoGFtUD2qJYWefKCCbFcu7F/AQ5sJXvqTIVAHnFn3paaV2zhN5t7iyKYp1qxc+ugOky+72xcbg==", - "requires": { - "ethjs": "^0.3.0" - } - }, "ethereumjs-util": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", @@ -18041,7 +18051,7 @@ "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.7.tgz", "integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==", "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xhr2-cookies": "^1.1.0", @@ -18085,7 +18095,7 @@ "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz", "integrity": "sha1-jZWCAsftuq6Dlwf7pvCf8ydgYhA=", "requires": { - "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git#572d4bafe08a8a231137e1f9daeb0f8a23f197d2", + "ethereumjs-abi": "git+https://github.com/ethereumjs/ethereumjs-abi.git", "ethereumjs-util": "^5.1.1" } }, diff --git a/package.json b/package.json index 8dc415a0c3d7..a92a15ac983c 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "ethjs-unit": "0.1.6", "events": "3.0.0", "fuse.js": "3.4.4", - "gaba": "1.0.0-beta.68", + "gaba": "file:../gaba/dist/gaba-1.0.0-beta.68.tgz", "https-browserify": "0.0.1", "jsc-android": "236355.1.1", "multihashes": "0.4.14", From a09d909711cfa4713d68e8de222fdcce2f87b3f4 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 4 Apr 2019 18:00:46 -0400 Subject: [PATCH 2/5] clean up --- app/components/UI/Collectibles/index.js | 6 +----- app/components/UI/Tokens/index.js | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/components/UI/Collectibles/index.js b/app/components/UI/Collectibles/index.js index 24256d3fa450..8c921f3ca800 100644 --- a/app/components/UI/Collectibles/index.js +++ b/app/components/UI/Collectibles/index.js @@ -7,7 +7,6 @@ import ActionSheet from 'react-native-actionsheet'; import Engine from '../../../core/Engine'; import CollectibleImage from '../CollectibleImage'; import AssetElement from '../AssetElement'; -import { toChecksumAddress } from 'ethereumjs-util'; const styles = StyleSheet.create({ wrapper: { @@ -110,10 +109,7 @@ export default class Collectibles extends Component { removeCollectible = () => { const { AssetsController } = Engine.context; - AssetsController.removeCollectible( - toChecksumAddress(this.collectibleToRemove.address), - this.collectibleToRemove.tokenId - ); + AssetsController.removeCollectible(this.collectibleToRemove.address, this.collectibleToRemove.tokenId); Alert.alert(strings('wallet.collectible_removed_title'), strings('wallet.collectible_removed_desc')); }; diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js index 0be82b10c1be..684b142fbc70 100644 --- a/app/components/UI/Tokens/index.js +++ b/app/components/UI/Tokens/index.js @@ -11,7 +11,6 @@ import { renderFromTokenMinimalUnit, balanceToFiat } from '../../../util/number' import Engine from '../../../core/Engine'; import AssetElement from '../AssetElement'; import FadeIn from 'react-native-fade-in-image'; -import { toChecksumAddress } from 'ethereumjs-util'; const styles = StyleSheet.create({ wrapper: { @@ -185,7 +184,7 @@ export default class Tokens extends PureComponent { removeToken = () => { const { AssetsController } = Engine.context; - AssetsController.removeToken(toChecksumAddress(this.tokenToRemove.address)); + AssetsController.removeToken(this.tokenToRemove.address); Alert.alert(strings('wallet.token_removed_title'), strings('wallet.token_removed_desc')); }; From 25a6eae0c0679fa66ae011dfc5fb98b28aa3c65c Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 4 Apr 2019 18:06:16 -0400 Subject: [PATCH 3/5] fix typo --- locales/en.json | 4 ++-- locales/es.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index 981844e3e0c6..3fe0a91f86b2 100644 --- a/locales/en.json +++ b/locales/en.json @@ -119,9 +119,9 @@ "remove_token_title": "Do you want to remove this token?", "remove_collectible_title": "Do you want to remove this collectible?", "token_removed_title": "Token removed!", - "token_removed_desc": "If you change your mind, you can add it back by tapping on \"Add Token\"", + "token_removed_desc": "If you change your mind, you can add it back by tapping on \"+ ADD TOKENS\"", "collectible_removed_title": "Collectible removed!", - "collectible_removed_desc": "If you change your mind, you can add it back by tapping on \"Add Collectible\"", + "collectible_removed_desc": "If you change your mind, you can add it back by tapping on \"+ ADD COLLECTIBLES\"", "remove": "Remove", "cancel": "Cancel" }, diff --git a/locales/es.json b/locales/es.json index 9c17ffe8326b..8fadf0376bfb 100644 --- a/locales/es.json +++ b/locales/es.json @@ -119,7 +119,7 @@ "remove_token_title": "Deseas eliminar este token?", "remove_collectible_title": "Deseas eliminar este coleccionable?", "token_removed_title": "Token eliminado!", - "token_removed_desc": "Si cambias de opinión, puedes agregarlo nuevamente presionando en \"Agregar Token\"", + "token_removed_desc": "Si cambias de opinión, puedes agregarlo nuevamente presionando en \"+ AGREGAR TOKENS\"", "collectible_removed_title": "Coleccionable eliminado!", "collectible_removed_desc": "Si cambias de opinión, puedes agregarlo nuevamente presionando en \"Agregar Coleccionable\"", "remove": "Eliminar", From d967d76abc0fc13183df4b27320f5fdb03e4e2f2 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 4 Apr 2019 18:32:15 -0400 Subject: [PATCH 4/5] bump gaba --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a92a15ac983c..5759c2c95d4c 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "ethjs-unit": "0.1.6", "events": "3.0.0", "fuse.js": "3.4.4", - "gaba": "file:../gaba/dist/gaba-1.0.0-beta.68.tgz", + "gaba": "1.0.0-beta.69", "https-browserify": "0.0.1", "jsc-android": "236355.1.1", "multihashes": "0.4.14", From 53f5c06c9e35a30846c2bbbd1d1ade8653b9539c Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Thu, 4 Apr 2019 18:33:53 -0400 Subject: [PATCH 5/5] update package-lock --- package-lock.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d55f6a54c5d..d1e028db938f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7990,8 +7990,9 @@ } }, "gaba": { - "version": "file:../gaba/dist/gaba-1.0.0-beta.68.tgz", - "integrity": "sha512-Qf0X39m4yGAkOiuO4m6ofit4D40OKdkWMp1W4l4oAqTpp1cQAkQCkFDUg6R9VV/kP9hyrI/6dP2FFbB4OlECiA==", + "version": "1.0.0-beta.69", + "resolved": "https://registry.npmjs.org/gaba/-/gaba-1.0.0-beta.69.tgz", + "integrity": "sha512-YdCE6nBCqD9Au833aj7Hm/0a+NHjRrltb9vq8jTEVOsZ3w5Bep/C3GZeCzF/cQZFLHpNym6obFednZLj0KQkGw==", "requires": { "await-semaphore": "^0.1.3", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31",