From 7b27e6ef9274b327f961f7ed5cdc8a3c486b27b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Let=C3=ADcia=20Camara?= Date: Wed, 14 Nov 2018 21:50:02 -0200 Subject: [PATCH] Fix website duplication and show on map nowrap text --- src/components/pages/MerchantsPage.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/pages/MerchantsPage.js b/src/components/pages/MerchantsPage.js index 155e77b..ad42e68 100644 --- a/src/components/pages/MerchantsPage.js +++ b/src/components/pages/MerchantsPage.js @@ -55,12 +55,9 @@ const mapsStyles = { const columnData = [ { id: 'name', numeric: false, disablePadding: true, label: 'Name' }, { id: 'address', numeric: false, disablePadding: true, label: 'Address' }, - { id: 'city', numeric: false, disablePadding: true, label: 'City' }, - { id: 'country', numeric: false, disablePadding: true, label: 'Country' }, { id: 'phone', numeric: false, disablePadding: true, label: 'Phone' }, - { id: 'link', numeric: false, disablePadding: false, label: 'Website' }, { id: 'telegram', numeric: false, disablePadding: true, label: 'Telegram' }, - { id: 'website', numeric: false, disablePadding: true, label: 'Website' }, + { id: 'link', numeric: false, disablePadding: false, label: 'Website' }, { id: 'map', numeric: false, disablePadding: false, label: 'Maps', disableSearch: true} ]; @@ -242,7 +239,8 @@ class MerchantsPage extends Component { variant="contained" style={{ backgroundColor: "#139657", - color: 'white' + color: 'white', + whiteSpace: 'nowrap' }} onClick={() => this.openMaps( merchant.name,