Merge remote-tracking branch 'upstream/master' into reduxrefactor

Author: firstred

.travis.yml

@@ -3,7 +3,7 @@ matrix:
   - os: osx
     osx_image: xcode9.4
     language: node_js
-    node_js: '10'
+    node_js: '12'
     env:
     - HOMEBREW_NO_AUTO_UPDATE=1
     - ELECTRON_CACHE=$HOME/.cache/electron
@@ -12,7 +12,7 @@ matrix:
     services: docker
     language: generic
     sudo: required
-    node_js: '10'
+    node_js: '12'
 
 addons:
   apt:

src/components/FilterComponents/CardSelection.tsx

@@ -99,7 +99,7 @@ class CardSelection extends React.Component<ReturnType<typeof mapStateToProps> &
             // ensure card exists
             if (!card) return null;
             card = card;
-            const { cardImage, cardType } = getCardTypeImage(card.type, card.cardType);
+            const { cardImage, cardType } = getCardTypeImage(card);
 
             // display big chip or smaller icon
             return (
@@ -132,7 +132,7 @@ class CardSelection extends React.Component<ReturnType<typeof mapStateToProps> &
                 }
 
                 const cardDescription = getCardDescription(card);
-                const { cardImage, cardType } = getCardTypeImage(card.type, card.cardType);
+                const { cardImage, cardType } = getCardTypeImage(card);
 
                 return (
                     <MenuItem key={key} onClick={this.addCardId(card.id)}>

src/pages/Cards/CardListItem.tsx

@@ -10,15 +10,29 @@ const styles = {
     cardImage: {}
 };
 
-export const getCardTypeImage = (type, apiType = "CardDebit") => {
+export const getCardTypeImage = (card) => {
+    const type = card.type;
+    const productType = card.product_type;
+    let cardType = card.cardType;
+
     let cardImage = null;
-    let cardType = null;
     switch (type) {
         case "MASTERCARD": {
-            switch (apiType) {
+            // check the different physical mastercard types
+            switch (cardType) {
                 case "CardCredit":
-                    cardType = "MasterCard Credit";
-                    cardImage = "images/bunq-mastercard-credit.png";
+                    // check the different credit card types
+                    switch (productType) {
+                        case "MASTERCARD_GREEN":
+                            cardType = "MasterCard Green";
+                            cardImage = "images/bunq-mastercard-metal.png";
+                            break;
+                        default:
+                        case "MASTERCARD_TRAVEL":
+                            cardType = "MasterCard Credit";
+                            cardImage = "images/bunq-mastercard-credit.png";
+                            break;
+                    }
                     break;
                 default:
                 case "CardDebit":
@@ -56,7 +70,7 @@ class CardListItem extends React.Component<{ card: Card; onClick: any }> {
 
     render() {
         const card = this.props.card;
-        const { cardImage } = getCardTypeImage(card.type, card.cardType);
+        const { cardImage } = getCardTypeImage(card);
 
         return [
             <div className="single-card" style={styles.cardWrapper} onClick={this.props.onClick}>