Merge branch 'master' into mx

src/components/LayerMap.js

@@ -308,19 +308,6 @@ CustomLayerMap.propTypes = propTypes;
 // Assign default values to the optional props
 CustomLayerMap.defaultProps = defaultProps;
 
-/**
- * This object is used for type checking the props of the component.
- */
-const propTypesLayerMap = {
-  ambassadorsLayer: PropTypes.bool,
-  merchantsLayer: PropTypes.bool,
-  showControls: PropTypes.bool,
-  mapHeight: PropTypes.string,
-  ambassadors: PropTypes.array,
-  merchants: PropTypes.array,
-  tellers: PropTypes.array,
-};
-
 // Type checking the props of the component
 CustomLayerMap.propTypes = propTypes;
 // Assign default values to the optional props

src/components/pages/MerchantsPage.js

@@ -204,25 +204,6 @@ class MerchantsPage extends Component {
     });
 
     result.data.map(teller => {
-      const infoDescription = <div>
-        <div><b>Address</b>: {teller.address}</div>
-        {(teller.phone) && (<div><b>Phone</b>: {teller.phone}</div>)}
-        </div>;
-      if(teller.telegram){
-        teller.telegram_original = teller.telegram;
-        teller.telegram = {
-          searchText: teller.telegram_original,
-          value: (
-            <a
-              href={`https://t.me/${(teller.telegram_original.trim().charAt(0) === '@') ?
-                teller.telegram_original.trim().slice(1): teller.telegram_original.trim()}`}
-              target="_blank"
-              rel="noopener noreferrer"
-            >{teller.telegram}</a>
-          )
-        };
-      }
-
       teller.link = {
         searchText: stripProtocol(teller.url),
         value: (

src/components/sections/MainSection.js

@@ -17,7 +17,7 @@ function MainSection() {
     <View className="vmain">
       <Mask className="d-flex justify-content-center align-items-center gradient">
         <Container className="px-md-3 px-sm-0">
-          <Row className="col-md-10 mx-md-auto">
+          <Row>
             <Col lg="10" className="mx-auto white-text text-center">
               <h1 className="text-uppercase">
                 <strong className="important">

src/utils/feathers.js

@@ -3,7 +3,7 @@ import feathers from '@feathersjs/client';
 const app = feathers();
 // Change to your production ambassador web service
 //const restClient = feathers.rest('http://localhost:3030');
-const restClient = feathers.rest('https://ambpay.palmpay.io');
+const restClient = feathers.rest('https://intranet.palmpay.io');
 
 // Configure an Fetch AJAX library with that client. For fetch details see https://facebook.github.io/react-native/docs/network.html
 // For rest details see https://docs.feathersjs.com/api/client/rest.html