Skip to content

Commit

Permalink
Merge branch 'develop' into support/release-merge-conflicts
Browse files Browse the repository at this point in the history
* develop: (42 commits)
  chore(llm): 🏚️ run tests at `e2e/specs/*.spec.ts` (#7928)
  feat: use cal as sell provider source of true (#7886)
  fix: external workflow call
  fix: checkout external contributions
  fix: external contribution concurrency
  test: get logs for failed tests
  fix: external contribution conditions to run
  ✨(lld): add details drawer for inscriptions (#7908)
  chore(lld): 👌 always skip the analytics prompt in e2e tests (#7910)
  ✨(lld): add protect box inside discovery drawer (#7924)
  feat: 🌐 localize storyly (#7923)
  chore(llm): 👌 always skip the analytics prompt in e2e tests (#7890)
  fix: increase FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT for nightly build
  test: 🐛 creating new addAccount function for mocked tests
  test: 🧪 fix add account (bitcoin)
  fix(wallet-api): open any deep-link from the webview on LLM Needed for wallet-connect-live-app deep-link back to mobile dApps
  fix: remove rewards from near staking
  fix(LLM): allow wallet-connect live-app to open a deep-link at any time [LIVE-13641] Refactor by sharing a single constant for wallet-connect live-app manifest id
  chore: bump storyly version and adapt new api spec (#7896)
  🐛(lld): fix inte test for nfts (#7914)
  ...
  • Loading branch information
valpinkman committed Sep 27, 2024
2 parents 2cbdeea + 6464ba7 commit f740a5e
Show file tree
Hide file tree
Showing 139 changed files with 3,692 additions and 1,834 deletions.
5 changes: 5 additions & 0 deletions .changeset/big-snakes-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Always skip the analytics prompt in e2e tests
5 changes: 5 additions & 0 deletions .changeset/calm-pets-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

bump storyly version
8 changes: 8 additions & 0 deletions .changeset/clever-rocks-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"live-mobile": patch
---

fix(wallet-api): only call success and fail handlers when closing the flow on LLM

Allows to properly retry the sign message without sending an error through the wallet-api
We also only send the success when we actually close the last success screen
6 changes: 6 additions & 0 deletions .changeset/dry-otters-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"ledger-live-desktop": patch
"@ledgerhq/live-nft": patch
---

Add detail drawers for inscriptions of ordinals protocol
5 changes: 5 additions & 0 deletions .changeset/empty-clouds-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Add ui for empty rare sats and inscriptions. Add error message from Error when inscriptions / rare sats can't load. Add dumy drawer for inscriptions
6 changes: 6 additions & 0 deletions .changeset/four-worms-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@ledgerhq/live-common": patch
"@ledgerhq/coin-evm": patch
---

chore: update default explorer for local base & zkevm config, update evm bridge test
5 changes: 5 additions & 0 deletions .changeset/fresh-cobras-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Fix unstable integration test
5 changes: 5 additions & 0 deletions .changeset/green-starfishes-suffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

add change address disclaimer for utxos accounts
6 changes: 6 additions & 0 deletions .changeset/olive-drinks-complain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"ledger-live-desktop": patch
"live-mobile": patch
---

Update turbo.json to accept envs
8 changes: 8 additions & 0 deletions .changeset/rare-yaks-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@ledgerhq/coin-near": patch
"ledger-live-desktop": patch
"live-mobile": patch
"@ledgerhq/live-common": patch
---

remove rewards feature from near
5 changes: 5 additions & 0 deletions .changeset/six-hairs-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Run tests files at `e2e/specs/*.spec.ts`
9 changes: 9 additions & 0 deletions .changeset/slow-dingos-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"ledger-live-desktop": patch
"live-mobile": patch
"@ledgerhq/live-common": patch
---

fix(LLM): allow wallet-connect live-app to open a deep-link at any time

Refactor by sharing a single constant for wallet-connect live-app manifest id
7 changes: 7 additions & 0 deletions .changeset/sour-poets-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"live-mobile": patch
---

fix(LLM): wallet-connect deep-link from native app for a request would reload the page

Reloading the page would break the wallet-api flow shown when coming back to the app
5 changes: 5 additions & 0 deletions .changeset/strong-goats-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Always skip the analytics prompt in e2e tests
7 changes: 7 additions & 0 deletions .changeset/tough-terms-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"live-mobile": patch
---

fix(wallet-api): open any deep-link from the webview on LLM

Needed for wallet-connect-live-app deep-link back to mobile dApps
5 changes: 5 additions & 0 deletions .changeset/witty-bugs-add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

storyly stories localization
5 changes: 5 additions & 0 deletions .changeset/witty-cows-breathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Add protectBox to protect ordinals in discovery drawer
14 changes: 13 additions & 1 deletion .github/workflows/build-and-test-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
jobs:
determine-affected:
name: "Turbo Affected"
if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name != github.repository }}
if: ${{github.event.pull_request.head.repo.full_name != github.repository }}
uses: LedgerHQ/ledger-live/.github/workflows/turbo-affected-reusable.yml@develop
with:
head_branch: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
Expand All @@ -26,18 +26,30 @@ jobs:
needs: determine-affected
if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name != github.repository }}
uses: LedgerHQ/ledger-live/.github/workflows/build-desktop-external-reusable.yml@develop
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
secrets: inherit

test-desktop-external:
name: "[External] Test Desktop"
needs: determine-affected
if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-desktop') && github.event.pull_request.head.repo.full_name != github.repository }}
uses: LedgerHQ/ledger-live/.github/workflows/test-desktop-external-reusable.yml@develop
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
secrets: inherit

build-mobile-external:
name: "[External] Build Mobile"
needs: determine-affected
if: ${{contains(needs.determine-affected.outputs.paths, 'ledger-live-mobile') && github.event.pull_request.head.repo.full_name != github.repository}}
uses: LedgerHQ/ledger-live/.github/workflows/build-mobile-external-reusable.yml@develop
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
secrets: inherit

# Final Check required
ok:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-and-test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ permissions:
jobs:
determine-affected:
name: "Turbo Affected"
if: ${{github.event.pull_request.head.repo.full_name == github.repository }}
uses: LedgerHQ/ledger-live/.github/workflows/turbo-affected-reusable.yml@develop
with:
head_branch: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-desktop-external-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ name: "@Desktop • Build App (external)"

on:
workflow_call:
workflow_dispatch:
inputs:
ref:
type: string
description: |
If you run this manually, and want to run on a PR, the correct ref should be refs/pull/{PR_NUMBER}/merge to
have the "normal" scenario involving checking out a merge commit between your branch and the base branch.
If you want to run only on a branch or specific commit, you can use either the sha or the branch name instead (prefer the first verion for PRs).
required: false
login:
description: The GitHub username that triggered the workflow
required: false
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
required: true
repository:
description: The repository to checkout the code from
type: string
required: true

jobs:
build-desktop-app:
Expand Down Expand Up @@ -46,7 +44,9 @@ jobs:
}
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup git user
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/build-mobile-external-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,34 @@ name: "@Mobile • Build App (external)"

on:
workflow_call:
workflow_dispatch:
inputs:
ref:
type: string
description: |
If you run this manually, and want to run on a PR, the correct ref should be refs/pull/{PR_NUMBER}/merge to
have the "normal" scenario involving checking out a merge commit between your branch and the base branch.
If you want to run only on a branch or specific commit, you can use either the sha or the branch name instead (prefer the first verion for PRs).
login:
description: The GitHub username that triggered the workflow
required: false
base_ref:
description: The base branch to merge the head into when checking out the code
required: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name != 'develop' && github.ref || github.run_id }}
cancel-in-progress: true
required: true
repository:
description: The repository to checkout the code from
type: string
required: true

permissions:
contents: read

jobs:
build-mobile-app-android:
name: "Build Ledger Live Mobile (Android)"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
NODE_OPTIONS: "--max-old-space-size=7168"
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup git user
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
Expand Down Expand Up @@ -92,7 +89,9 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup git user
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
Expand All @@ -105,7 +104,7 @@ jobs:
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm

report:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [build-mobile-app-android, build-mobile-app-ios]
if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' }}
steps:
Expand Down
63 changes: 25 additions & 38 deletions .github/workflows/test-desktop-external-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ name: "@Desktop • Test App (external)"

on:
workflow_call:
workflow_dispatch:
inputs:
ref:
type: string
description: |
If you run this manually, and want to run on a PR, the correct ref should be refs/pull/{PR_NUMBER}/merge to
have the "normal" scenario involving checking out a merge commit between your branch and the base branch.
If you want to run only on a branch or specific commit, you can use either the sha or the branch name instead (prefer the first verion for PRs).
required: false
login:
description: The GitHub username that triggered the workflow
required: false
base_ref:
description: The base branch to merge the head into when checking out the code
required: false
required: true
repository:
description: The repository to checkout the code from
type: string
required: true

permissions:
id-token: write
Expand All @@ -27,12 +25,14 @@ jobs:
env:
NODE_OPTIONS: "--max-old-space-size=7168"
FORCE_COLOR: 3
CI_OS: ubuntu-latest
runs-on: ubuntu-latest
CI_OS: ubuntu-22.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
Expand Down Expand Up @@ -63,12 +63,14 @@ jobs:
env:
NODE_OPTIONS: "--max-old-space-size=7168"
FORCE_COLOR: 3
CI_OS: ubuntu-latest
runs-on: ubuntu-latest
CI_OS: ubuntu-22.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
Expand All @@ -84,17 +86,19 @@ jobs:
env:
NODE_OPTIONS: "--max-old-space-size=7168"
FORCE_COLOR: 3
CI_OS: ubuntu-latest
CI_OS: ubuntu-22.04
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
# DEBUG: "pw:browser*"
# DEBUG_LOGS: 1
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
status: ${{ steps.tests.outcome }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
Expand Down Expand Up @@ -147,12 +151,14 @@ jobs:

report:
needs: [codechecks, unit-tests, e2e-tests-linux]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
ref: ${{ inputs.ref }}
repository: ${{ inputs.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
persist-credentials: false
- name: "download linter results"
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -318,22 +324,3 @@ jobs:
with:
name: summary.json
path: ${{ github.workspace }}/summary.json

allure-report:
name: "Allure Reports Export on Server"
needs: [e2e-tests-linux]
runs-on: [ledger-live-medium]
if: ${{ !cancelled() && github.ref_name == 'develop' }}
steps:
- name: checkout
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
- name: Send Results and Generate Allure Report - Linux
uses: LedgerHQ/ledger-live/tools/actions/composites/upload-allure-report@develop
if: ${{ !cancelled() }}
with:
platform: linux
login: ${{ vars.ALLURE_USERNAME }}
password: ${{ secrets.ALLURE_LEDGER_LIVE_PASSWORD }}
path: allure-results-linux
Loading

0 comments on commit f740a5e

Please sign in to comment.