From a340675c916edadda8dc64665e4340d816ba53b0 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Fri, 24 Jul 2020 13:49:16 +1000
Subject: [PATCH] Add Apple Pay, Google Pay, Shop Pay, Visa, Master, Amex and
 Venmo detection

---
 src/apps.json                                 | 61 +++++++++++++++++++
 .../webextension/images/icons/Apple.svg       | 33 +++-------
 2 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 1855d16e6..1dfe6b568 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1,6 +1,67 @@
 {
   "$schema": "../schema.json",
   "apps": {
+    "Apple Pay": {
+      "cats": [
+        41
+      ],
+      "html": [
+        "<[^>]+aria-labelledby=\"pi-apple_pay",
+        "<script id=\"apple-pay"
+      ],
+      "icon": "Apple.svg",
+      "website": "https://www.apple.com/apple-pay"
+    },
+    "Google Pay": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-google_pay",
+      "icon": "Google.svg",
+      "website": "https://pay.google.com"
+    },
+    "Shop Pay": {
+      "cats": [
+        41
+      ],
+      "url": "^https://pay.shopify.com",
+      "html": "<[^>]+aria-labelledby=\"pi-shopify_pay",
+      "icon": "Shopify.svg",
+      "implies": "Shopify",
+      "website": "https://pay.google.com"
+    },
+    "Venmo": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-venmo",
+      "icon": "Venmo.svg",
+      "website": "https://venmo.com"
+    },
+    "Visa": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-visa",
+      "icon": "Visa.svg",
+      "website": "https://www.visa.com"
+    },
+    "Mastercard": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-mastercard",
+      "icon": "Mastercard.svg",
+      "website": "https://www.mastercard.com"
+    },
+    "American Express": {
+      "cats": [
+        41
+      ],
+      "html": "<[^>]+aria-labelledby=\"pi-american_express",
+      "icon": "Amex.svg",
+      "website": "https://www.americanexpress.com"
+    },
     "1C-Bitrix": {
       "cats": [
         1,
diff --git a/src/drivers/webextension/images/icons/Apple.svg b/src/drivers/webextension/images/icons/Apple.svg
index 2954f0f52..d0e888fea 100644
--- a/src/drivers/webextension/images/icons/Apple.svg
+++ b/src/drivers/webextension/images/icons/Apple.svg
@@ -1,23 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="747.63776" height="909.28345" id="svg2811">
-  <defs id="defs2813">
-    <clipPath id="clp12">
-      <path d="M 45.315,71.927 L 58.235,71.927 L 58.235,87.794 L 45.315,87.794 L 45.315,71.927 z " id="path184"/>
-    </clipPath>
-    <clipPath id="clp21">
-      <path d="M 123.91,72.178 L 150.14,72.178 L 150.14,87.472 L 123.91,87.472 L 123.91,72.178 z " id="path592"/>
-    </clipPath>
-    <clipPath id="clp9">
-      <path d="M 413.96,49.857 L 445.72,49.857 L 445.72,58.576 L 413.96,58.576 L 413.96,49.857 z " id="path100"/>
-    </clipPath>
-  </defs>
-  <g transform="translate(-1074.235,-1639.219)" id="layer1">
-    <g transform="translate(19.48863,19.49672)" id="g25472">
-      <g transform="matrix(54.85033,0,0,-54.85033,-1411.313,6454.729)" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" clip-path="url(#clp12)" id="g186">
-        <path d="M 56.105,79.364 C 56.087,81.372 57.745,82.336 57.82,82.383 C 56.887,83.748 55.435,83.935 54.917,83.957 C 53.682,84.082 52.506,83.23 51.88,83.23 C 51.254,83.23 50.286,83.939 49.262,83.919 C 47.914,83.899 46.673,83.136 45.979,81.93 C 44.58,79.503 45.622,75.906 46.984,73.936 C 47.651,72.973 48.445,71.888 49.489,71.928 C 50.495,71.968 50.875,72.578 52.089,72.578 C 53.303,72.578 53.645,71.928 54.708,71.947 C 55.789,71.968 56.475,72.931 57.137,73.897 C 57.901,75.015 58.217,76.097 58.235,76.154 C 58.211,76.164 56.127,76.963 56.105,79.364" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path188"/>
-      </g>
-      <path d="M 1556.5087,1778.2074 C 1586.8952,1741.403 1607.4089,1690.2272 1601.7588,1639.2187 C 1557.9852,1640.9758 1505.0032,1668.3995 1473.5732,1705.2039 C 1445.4359,1737.7314 1420.7536,1789.8374 1427.4422,1839.8074 C 1476.2605,1843.5921 1526.1172,1814.9577 1556.5087,1778.2074" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path190"/>
-    </g>
-  </g>
-</svg>
\ No newline at end of file
+<svg width="1188" height="1188" viewBox="0 0 1188 1188" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M1073.04 925.187C1055.09 966.665 1033.84 1004.84 1009.21 1039.95C975.651 1087.8 948.17 1120.92 926.992 1139.32C894.162 1169.51 858.986 1184.97 821.32 1185.85C794.279 1185.85 761.668 1178.16 723.709 1162.55C685.624 1147.01 650.625 1139.32 618.623 1139.32C585.06 1139.32 549.064 1147.01 510.562 1162.55C472.001 1178.16 440.937 1186.29 417.186 1187.1C381.066 1188.63 345.063 1172.73 309.125 1139.32C286.188 1119.31 257.499 1085.01 223.129 1036.43C186.254 984.545 155.938 924.381 132.187 855.79C106.751 781.702 94 709.959 94 640.503C94 560.941 111.192 492.32 145.627 434.816C172.69 388.627 208.693 352.191 253.754 325.444C298.815 298.696 347.503 285.065 399.936 284.193C428.626 284.193 466.248 293.068 513.002 310.509C559.624 328.008 589.559 336.883 602.684 336.883C612.496 336.883 645.752 326.506 702.127 305.819C755.44 286.634 800.434 278.69 837.295 281.819C937.178 289.88 1012.22 329.254 1062.12 400.191C972.793 454.317 928.604 530.126 929.483 627.378C930.289 703.129 957.77 766.166 1011.78 816.218C1036.25 839.448 1063.59 857.402 1094 870.153C1087.41 889.279 1080.44 907.6 1073.04 925.187V925.187ZM843.964 23.7507C843.964 83.1241 822.272 138.561 779.036 189.873C726.86 250.872 663.75 286.121 595.312 280.559C594.44 273.436 593.934 265.939 593.934 258.061C593.934 201.063 618.747 140.063 662.812 90.1878C684.811 64.9349 712.79 43.9376 746.719 27.1876C780.575 10.6875 812.599 1.5626 842.718 0C843.597 7.9373 843.964 15.8751 843.964 23.7499V23.7507Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="1187.2" height="1187.2" fill="white"/>
+</clipPath>
+</defs>
+</svg>