From f8f1d04ba801d399c7b32f5098e78fcc175f0923 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Mon, 29 Apr 2019 19:13:01 -0400 Subject: [PATCH 1/2] use collectible contract if image collectible is empty --- app/components/Views/Collectible/index.js | 3 +++ package-lock.json | 5 ++--- package.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/components/Views/Collectible/index.js b/app/components/Views/Collectible/index.js index 8433b2d4e276..dcea0d4bce43 100644 --- a/app/components/Views/Collectible/index.js +++ b/app/components/Views/Collectible/index.js @@ -81,6 +81,9 @@ class Collectible extends Component { if (!collectible.name || collectible.name === '') { collectible.name = collectibleContract.name; } + if (!collectible.image && collectibleContract.logo) { + collectible.image = collectibleContract.logo; + } return collectible; }); diff --git a/package-lock.json b/package-lock.json index c9a447032964..4c2c28c6cd13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8177,9 +8177,8 @@ } }, "gaba": { - "version": "1.0.0-beta.74", - "resolved": "https://registry.npmjs.org/gaba/-/gaba-1.0.0-beta.74.tgz", - "integrity": "sha512-vIT91/lmzDursuFBu68bjVo1j7InZ3ha+eCu4nM3Z3G/oNUgMpI1c0Djo6cGI5UtBRZODciu6ULyFsnvBxFN9A==", + "version": "file:../gaba/dist/gaba-1.0.0-beta.74.tgz", + "integrity": "sha512-Yj6nNf8sAIV7MaaOs9dcFOFy3sF8awKYxxyj8F4SgOUCAgbxIWbcXc5njq5ukXJu77m6boFQRXhECnfiPsnN5g==", "requires": { "await-semaphore": "^0.1.3", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31", diff --git a/package.json b/package.json index 45baeaf34cf8..fb69bbe0439a 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.74", + "gaba": "file:../gaba/dist/gaba-1.0.0-beta.74.tgz", "https-browserify": "0.0.1", "jsc-android": "236355.1.1", "lottie-react-native": "2.6.1", From 5dc3da44de04e997ea86505b7661f709f79320c2 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 1 May 2019 13:20:24 -0400 Subject: [PATCH 2/2] bump gaba --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c2c28c6cd13..32c21416c8bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5622,9 +5622,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.127", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.127.tgz", - "integrity": "sha512-1o25iFRf/dbgauTWalEzmD1EmRN3a2CzP/K7UVpYLEBduk96LF0FyUdCcf4Ry2mAWJ1VxyblFjC93q6qlLwA2A==" + "version": "1.3.128", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.128.tgz", + "integrity": "sha512-1QK+KELj1mhC9iE7grSP9PP2f06F85UgTs0M9qjuvSuKwxbyifhyPB8dZ27IlYvzMBnLtO4oHNBKTQoN6Tg5mg==" }, "elegant-spinner": { "version": "1.0.1", @@ -8177,8 +8177,9 @@ } }, "gaba": { - "version": "file:../gaba/dist/gaba-1.0.0-beta.74.tgz", - "integrity": "sha512-Yj6nNf8sAIV7MaaOs9dcFOFy3sF8awKYxxyj8F4SgOUCAgbxIWbcXc5njq5ukXJu77m6boFQRXhECnfiPsnN5g==", + "version": "1.0.0-beta.75", + "resolved": "https://registry.npmjs.org/gaba/-/gaba-1.0.0-beta.75.tgz", + "integrity": "sha512-nxfhx2AktDXnYriPnn/F+h/cLp5B1Z69/0ukvH4xJ5D/ejJs5e0MFVSK/KxQ6vMDxkeDAW/F+RpIhsRrqBJD5A==", "requires": { "await-semaphore": "^0.1.3", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#faa4f56fb17b3ae8579df68708be59d617732f31", diff --git a/package.json b/package.json index fb69bbe0439a..df18355ace28 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.74.tgz", + "gaba": "1.0.0-beta.75", "https-browserify": "0.0.1", "jsc-android": "236355.1.1", "lottie-react-native": "2.6.1",