Skip to content

Commit 9d5b38c

Browse files
committed
fix: resolve merge conflicts with upstream/main
2 parents f844efc + 72193f2 commit 9d5b38c

282 files changed

Lines changed: 54722 additions & 7595 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.env.example

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ EXPO_PUBLIC_SOROBAN_RPC_URL=https://soroban-testnet.stellar.org
88
# Deployed savings vault contract ID (C...). Leave empty to run the vault
99
# screen in mock mode no real funds are moved until this is set.
1010
EXPO_PUBLIC_VAULT_CONTRACT_ID=
11+
12+
# Set to 'false' to disable the vault tab UI (e.g., when SDK is not ready)
13+
EXPO_PUBLIC_VAULT_ENABLED=true
14+

.github/workflows/api-check.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: SDK API Compatibility Check
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'src/types/pocketpay-sdk.d.ts'
7+
- 'src/sdk-stub/**'
8+
- 'api-reports/**'
9+
- 'scripts/check-sdk-api.js'
10+
push:
11+
branches:
12+
- main
13+
paths:
14+
- 'src/types/pocketpay-sdk.d.ts'
15+
- 'src/sdk-stub/**'
16+
- 'api-reports/**'
17+
- 'scripts/check-sdk-api.js'
18+
19+
permissions:
20+
contents: read
21+
22+
jobs:
23+
api-check:
24+
name: Check pocketpay-sdk public API
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
30+
- name: Set up Node.js
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: 20
34+
35+
- name: Install dependencies
36+
run: npm install --legacy-peer-deps
37+
38+
- name: Check SDK public API
39+
run: npm run api:check

.github/workflows/ci.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/jest-setup.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/jest.config.ci.js

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Trigger Auto Merge Automation
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
9+
- ready_for_review
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
trigger-auto-merge:
16+
name: Trigger central auto-merge
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Trigger automation repo
21+
env:
22+
GH_TOKEN: ${{ secrets.AXIONVERA_AUTOMATION_TOKEN }}
23+
run: |
24+
gh api \
25+
--method POST \
26+
-H "Accept: application/vnd.github+json" \
27+
/repos/Axionvera/pocketpay-issue-automation/dispatches \
28+
-f event_type=axionvera-pr-opened \
29+
-F client_payload[repo]="${{ github.repository }}" \
30+
-F client_payload[pr_number]="${{ github.event.pull_request.number }}"

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,14 @@ yarn-error.*
4040
# generated native folders
4141
/ios
4242
/android
43+
44+
# spec-driven development documentation
45+
PRD.md
46+
Architecture.md
47+
Tasks.md
48+
task.md
49+
Memory.md
50+
Handoff.md
51+
52+
53+

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
legacy-peer-deps=true

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
}

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525
- Reusable `Button` and `Input` component library
2626
- Global state management with Zustand
2727
- React Native polyfills for Stellar SDK compatibility
28+
- Local public API compatibility check for `pocketpay-sdk` exports (`npm run api:check` / `api:update`), with a committed baseline in `api-reports/pocketpay-sdk.api.md`
2829

2930
### Changed
3031

3132
### Fixed
33+
- QR scanner no longer processes duplicate `onBarcodeScanned` events for the same code, preventing duplicate navigation/field updates on rapid-fire camera callbacks (#104)
3234

3335
### Security
3436

0 commit comments

Comments
 (0)