diff --git a/.github/workflows/prjob_cypress_tests.yml b/.github/workflows/prjob_cypress_tests.yml index 5ff88420..1f08272f 100644 --- 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 \ No newline at end of file + run: docker compose down \ No newline at end of file diff --git a/src/people/widgetViews/summaries/wantedSummaries/Invoice.tsx b/src/people/widgetViews/summaries/wantedSummaries/Invoice.tsx index bc192d0e..780ceb86 100644 --- 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'));