Merge pull request stakwork#573 from stakwork/feat/v2_payments_integr…

…ation PR: added v2 integration
aliraza556 · Aug 29, 2024 · fc27304 · fc27304
2 parents 7f9040a + 6c114e7
commit fc27304
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/prjob_cypress_tests.yml b/.github/workflows/prjob_cypress_tests.yml
@@ -45,7 +45,7 @@ jobs:
           timeout_minutes: 10
           max_attempts: 3
           command: |
-            GITACTION_ENV=gitactionenv docker-compose -f ./stack/alts/proxy.yml --project-dir ./stack up -d;
+            GITACTION_ENV=gitactionenv docker compose -f ./stack/alts/proxy.yml --project-directory ./stack up -d;
             sleep 240;
             docker ps
             docker logs meme.sphinx
@@ -79,4 +79,4 @@ jobs:
 
       - name: Stop Stack
         working-directory: ./stack
-        run: docker-compose down
+        run: docker compose down
diff --git a/src/people/widgetViews/summaries/wantedSummaries/Invoice.tsx b/src/people/widgetViews/summaries/wantedSummaries/Invoice.tsx
@@ -63,8 +63,14 @@ export default function Invoice(props: {
   qrSize?: number;
 }) {
   const decoded = lighningDecoder.decode(props.lnInvoice);
-  const expiry = decoded.sections[8].value;
+
+  let expiry = decoded.sections[8].value;
+  // if it's not v1, do v2
+  if (isNaN(expiry)) {
+    expiry = decoded.sections[10].value;
+  }
   const timeCreated = decoded.sections[4].value;
+
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const endTime = new Date((timeCreated + expiry) * 1000);
   const [timeLeft, setTimeLeft] = useState(calculateTimeLeft(endTime, 'hours'));