Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to React Native 0.73.6 #6596

Merged
merged 12 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions .changeset/beige-coins-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
"@ledgerhq/hw-transport-node-hid-singleton": minor
"@ledgerhq/hw-transport-node-speculos-http": minor
"@ledgerhq/hw-transport-node-hid-noevents": minor
"@ledgerhq/react-native-hw-transport-ble": minor
"@ledgerhq/swift-bridge-hw-transport-ble": minor
"@ledgerhq/hw-transport-node-speculos": minor
"@ledgerhq/swift-bridge-hw-app-solana": minor
"@ledgerhq/swift-bridge-hw-app-eth": minor
"@ledgerhq/hw-transport-node-hid": minor
"@ledgerhq/hw-transport-web-ble": minor
"@ledgerhq/hw-transport-mocker": minor
"@ledgerhq/hw-transport-webhid": minor
"@ledgerhq/hw-transport-webusb": minor
"@ledgerhq/hw-transport-vault": minor
"@ledgerhq/types-cryptoassets": minor
"@ledgerhq/hw-transport-http": minor
"@ledgerhq/react-native-hid": minor
"@actions/get-workflow-artifacts-id": minor
"@ledgerhq/hw-app-algorand": minor
"@ledgerhq/hw-app-exchange": minor
"@ledgerhq/hw-app-polkadot": minor
"@actions/generate-release-message": minor
"@ledgerhq/hw-app-cosmos": minor
"@ledgerhq/hw-app-helium": minor
"@ledgerhq/hw-app-solana": minor
"@ledgerhq/types-devices": minor
"@ledgerhq/cryptoassets": minor
"@ledgerhq/hw-app-tezos": minor
"@ledgerhq/hw-transport": minor
"@ledgerhq/hw-app-near": minor
"@ledgerhq/hw-app-btc": minor
"@ledgerhq/hw-app-eth": minor
"@ledgerhq/hw-app-str": minor
"@ledgerhq/hw-app-trx": minor
"@ledgerhq/hw-app-vet": minor
"@ledgerhq/hw-app-xrp": minor
"@ledgerhq/types-live": minor
"@ledgerhq/coin-algorand": minor
"@ledgerhq/coin-polkadot": minor
"@actions/get-package-infos": minor
"@actions/submit-bot-report": minor
"@ledgerhq/coin-bitcoin": minor
"@ledgerhq/devices": minor
"@ledgerhq/errors": minor
"@ledgerhq/live-countervalues-react": minor
"@ledgerhq/crypto-icons-ui": minor
"@actions/turbo-affected": minor
"@ledgerhq/coin-near": minor
"@ledgerhq/webpack.js-example": minor
"@actions/upload-images": minor
"@ledgerhq/coin-evm": minor
"@actions/build-checks": minor
"ledger-live-desktop": minor
"@ledgerhq/next.js-example": minor
"live-mobile": minor
"@ledgerhq/live-common": minor
"@ledgerhq/live-countervalues": minor
"@ledgerhq/native-ui": minor
"@ledgerhq/ethereum-provider": minor
"@ledgerhq/icons-ui": minor
"@ledgerhq/react-ui": minor
"@ledgerhq/dummy-wallet-app": minor
"@ledgerhq/wallet-api-exchange-module": minor
"@ledgerhq/dummy-live-app": minor
"@ledgerhq/coin-framework": minor
"@ledgerhq/domain-service": minor
"@ledgerhq/live-nft-react": minor
"@ledgerhq/device-react": minor
"@ledgerhq/live-network": minor
"@ledgerhq/device-core": minor
"@ledgerhq/live-github-bot": minor
"@ledgerhq/test-utils": minor
"@ledgerhq/web-tools": minor
"@ledgerhq/evm-tools": minor
"@ledgerhq/live-nft": minor
"@ledgerhq/actions-root": minor
"@ledgerhq/live-promise": minor
"@ledgerhq/live-cli": minor
"@ledgerhq/live-env": minor
---

Upgrade React Native to version 0.73.6
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = {
],
},
],
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-unused-vars": [
"error",
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-desktop-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
python-version: "3.x"
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
bundler-cache: true
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-mobile-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
env:
ImageOS: ubuntu20
- uses: actions/setup-java@v3
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
path: ${{ github.workspace }}/apps/ledger-live-mobile/android/app/build/outputs/apk/stagingRelease

build-mobile-app-ios:
runs-on: macos-latest
runs-on: [m1, ARM64]
name: "Build Ledger Live Mobile (Mac OS X)"
env:
NODE_OPTIONS: "--max-old-space-size=7168"
Expand All @@ -102,23 +102,20 @@ jobs:
- name: Setup git user
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
- name: Setup the toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
id: toolchain
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-caches@develop
id: caches
with:
accountId: ${{ secrets.AWS_ACCOUNT_ID_PROD }}
roleName: ${{ secrets.AWS_CACHE_ROLE_NAME }}
region: ${{ secrets.AWS_CACHE_REGION }}
skip-pod-cache: "false"
skip-turbo-cache: "false"
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: bundle ios and android js
run: |
pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.toolchain.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo"
pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.caches.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo"
pnpm mobile bundle:ios:prod
pnpm mobile bundle:android:prod
pnpm mobile gen-metafile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regen-pods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: regenerate pods
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-final-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
# Not needed with a .ruby-version file
# runs 'bundle install' and caches installed gems automatically
- uses: LedgerHQ/ledger-live/tools/actions/get-package-infos@develop
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-final.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: LedgerHQ/ledger-live/tools/actions/composites/setup-toolchain@develop
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: Cache LLM pods
uses: actions/cache@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-mobile-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ jobs:
roleName: ${{ secrets.AWS_CACHE_ROLE_NAME }}
region: ${{ secrets.AWS_CACHE_REGION }}
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- name: setup JDK 11
- name: setup JDK 17
uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "11"
java-version: "17"
cache: "gradle"
- name: setup Android SDK
uses: android-actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.3.0
- name: Install dependencies
run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
- name: Run linter
Expand Down
17 changes: 17 additions & 0 deletions .pnpmfile.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function readPackage(pkg, context) {
removeDependencies("react-redux", ["react-native"], {
kind: "peerDependencies",
}),

/* Storybook packages */
addDependencies("@storybook/webpack-config", { "resolve-from": "*" }),
addDependencies("@storybook/addon-knobs", {
Expand Down Expand Up @@ -199,6 +200,7 @@ function readPackage(pkg, context) {
}),
addDependencies("@actions/cache", { "@azure/abort-controller": "*" }),
addDependencies("rn-fetch-blob", { lodash: "*" }),

// addPeerDependencies("styled-components", { "react-native": "*" }),
addPeerDependencies("use-latest-callback", { react: "*" }),
addPeerDependencies("rn-range-slider", {
Expand All @@ -210,6 +212,8 @@ function readPackage(pkg, context) {
react: "*",
"react-native": "*",
}),

addDependencies("@react-native/dev-middleware", { ws: "*" }),
// "dmg-builder" is required to build .dmg electron apps on macs,
// but is not declared as such by app-builder-lib.
// I'm not adding it as a dependency because if I did,
Expand All @@ -219,6 +223,10 @@ function readPackage(pkg, context) {
"dmg-builder": "*",
lodash: "*",
}),

addPeerDependencies("react-native-config", {
"react-native": "*",
}),
// Try to prevent pnpm-lock.yaml flakiness
removeDependencies("follow-redirects", ["debug"], {
kind: "peerDependencies",
Expand Down Expand Up @@ -247,11 +255,20 @@ function readPackage(pkg, context) {
addDependencies("@dfinity/agent", {
buffer: "*",
}),
addDependencies("@react-native-community/cli-tools", {
execa: "5.0.0",
}),
addDependencies("@react-native-community/cli-platform-ios", {
execa: "5.0.0",
}),
// TODO:
// Tron missing deps
// They are also added to live-common dependencies
// Is there another way without adding them explicitly ?
addDependencies("tronweb", {
"aes-js": "*",
"@noble/hashes": "*",
"@noble/secp256k1": "*",
"@ethersproject/bytes": "*",
"@ethersproject/bignumber": "*",
"@ethersproject/keccak256": "*",
Expand Down
22 changes: 11 additions & 11 deletions apps/cli/src/commands/device/managerListApps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ export default {
format === "raw"
? r
: format === "json"
? JSON.stringify(r)
: r.appsListNames
.map(name => {
const item = r.appByName[name];
const ins = r.installed.find(i => i.name === item.name);
return (
`- ${item.name} ${item.version}` +
(ins ? (ins.updated ? " (installed)" : " (outdated!)") : "")
);
})
.join("\n"),
? JSON.stringify(r)
: r.appsListNames
.map(name => {
const item = r.appByName[name];
const ins = r.installed.find(i => i.name === item.name);
return (
`- ${item.name} ${item.version}` +
(ins ? (ins.updated ? " (installed)" : " (outdated!)") : "")
);
})
.join("\n"),
),
),
);
Expand Down
10 changes: 5 additions & 5 deletions apps/ledger-live-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@
"@ledgerhq/types-cryptoassets": "workspace:^",
"@ledgerhq/types-devices": "workspace:^",
"@ledgerhq/types-live": "workspace:^",
"@sentry/electron": "^4.15.1",
"@sentry/node": "7.84.0",
"@sentry/tracing": "7.84.0",
"@sentry/electron": "4.22.0",
"@sentry/node": "7.109.0",
"@sentry/tracing": "7.109.0",
"@tanstack/react-query": "^5.28.9",
"@tanstack/react-query-devtools": "^5.28.9",
"@tippyjs/react": "^4.2.6",
Expand Down Expand Up @@ -157,8 +157,8 @@
"@ledgerhq/test-utils": "workspace:^",
"@octokit/rest": "^18.12.0",
"@playwright/test": "^1.41.2",
"@sentry/cli": "^2.27.0",
"@sentry/types": "^7.99.0",
"@sentry/cli": "2.31.0",
"@sentry/types": "7.109.0",
"@testing-library/dom": "^9.3.3",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ const AccountCrumb = () => {
tokenAccount
? getAccountCurrency(tokenAccount)
: account
? getAccountCurrency(account)
: null,
? getAccountCurrency(account)
: null,
[tokenAccount, account],
);

Expand Down
8 changes: 4 additions & 4 deletions apps/ledger-live-desktop/src/renderer/components/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ const buttonStyles: Record<string, Record<string, ButtonStyle>> = {
p.disabled
? `${p.theme.colors.palette.action.disabled} !important`
: p.inverted
? p.theme.colors.palette.primary.contrastText
: p.theme.colors.palette.primary.main
? p.theme.colors.palette.primary.contrastText
: p.theme.colors.palette.primary.main
};
color: ${
p.disabled
? p.theme.colors.palette.text.shade20
: p.inverted
? p.theme.colors.palette.primary.main
: p.theme.colors.palette.primary.contrastText
? p.theme.colors.palette.primary.main
: p.theme.colors.palette.primary.contrastText
};
box-shadow: ${
p.isFocused
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function Button({
disabled={disabled}
onClick={isClickDisabled ? undefined : onClickHandler}
data-test-id={buttonTestId}
ref={null}
>
{children}
</Base>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ export default function Chart({
tickXScale === "week"
? new Date(d.date)
: tickXScale === "day"
? startOfHour(new Date(d.date))
: tickXScale === "minute"
? new Date(new Date(d.date).getTime() - i * 5 * 60 * 1000)
: startOfDay(new Date(d.date)),
? startOfHour(new Date(d.date))
: tickXScale === "minute"
? new Date(new Date(d.date).getTime() - i * 5 * 60 * 1000)
: startOfDay(new Date(d.date)),
y: d[valueKey],
})),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const Base = styled(Tabbable).attrs(() => ({
p.isChecked
? p.theme.colors.palette.primary.main
: p.inverted
? p.theme.colors.palette.primary.contrastText
: p.theme.colors.palette.text.shade60};
? p.theme.colors.palette.primary.contrastText
: p.theme.colors.palette.text.shade60};
color: ${p =>
p.isChecked
? p.inverted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ const ContextMenuItemContainer = styled(Box).attrs<ContextMenuItemContainerProps
color: p.disabled
? "palette.text.shade50"
: p.isActive
? "palette.text.shade100"
: "palette.text.shade60",
? "palette.text.shade100"
: "palette.text.shade60",
bg: p.isActive && !p.disabled ? "palette.background.default" : "",
}))<ContextMenuItemContainerProps>`
padding: 8px 16px;
Expand Down
Loading
Loading