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

release(wallet-mobile): v4.28.0 #3470

Merged
merged 6 commits into from
Aug 1, 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
4 changes: 2 additions & 2 deletions apps/wallet-mobile/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ android {
applicationId "com.emurgo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 688
versionName "4.27.0"
versionCode 690
versionName "4.28.0"
testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/ios/nightly.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.27.0</string>
<string>4.28.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>575</string>
<string>577</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
8 changes: 4 additions & 4 deletions apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@
CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 575;
CURRENT_PROJECT_VERSION = 577;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -884,7 +884,7 @@
CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 575;
CURRENT_PROJECT_VERSION = 577;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENVFILE = "$(PODS_ROOT)/../../.env.production";
Expand Down Expand Up @@ -1079,7 +1079,7 @@
CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 575;
CURRENT_PROJECT_VERSION = 577;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1124,7 +1124,7 @@
CODE_SIGN_ENTITLEMENTS = nightly.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 575;
CURRENT_PROJECT_VERSION = 577;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4;
ENVFILE = "$(PODS_ROOT)/../../.env.nightly";
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/ios/yoroi/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>4.27.0</string>
<string>4.28.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>575</string>
<string>577</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-mobile/ios/yoroiTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>4.27.0</string>
<string>4.28.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>575</string>
<string>577</string>
</dict>
</plist>
9 changes: 5 additions & 4 deletions apps/wallet-mobile/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yoroi/wallet-mobile",
"version": "4.27.1",
"version": "4.28.0",
"private": true,
"scripts": {
"android-bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res",
Expand Down Expand Up @@ -91,15 +91,15 @@
},
"dependencies": {
"@amplitude/analytics-react-native": "1.3.1",
"@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0",
"@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.3",
"@emurgo/cip14-js": "^3.0.1",
"@emurgo/cip4-js": "1.0.7",
"@emurgo/cross-csl-core": "4.4.0",
"@emurgo/cross-csl-mobile": "4.4.0",
"@emurgo/csl-mobile-bridge": "6.0.0-alpha.9",
"@emurgo/react-native-blockies-svg": "^0.0.2",
"@emurgo/react-native-hid": "^5.15.6",
"@emurgo/yoroi-lib": "0.15.5",
"@emurgo/yoroi-lib": "^0.15.6",
"@formatjs/intl-datetimeformat": "^6.7.0",
"@formatjs/intl-getcanonicallocales": "^2.1.0",
"@formatjs/intl-locale": "^3.2.1",
Expand Down Expand Up @@ -159,7 +159,7 @@
"react-intl": "^6.6.2",
"react-native": "~0.71.0",
"react-native-background-timer": "2.4.1",
"react-native-ble-plx": "^2.0.3",
"react-native-ble-plx": "2.0.3",
"react-native-bootsplash": "^4.6.0",
"react-native-config": "^1.5.0",
"react-native-crypto": "2.2.0",
Expand Down Expand Up @@ -190,6 +190,7 @@
"react-native-webview": "^11.25.0",
"react-query": "^3.39.3",
"reselect": "^4.0.0",
"rxjs": "^7.8.1",
"sentry-expo": "^7.0.1",
"stream-browserify": "3.0.0",
"tinycolor2": "1.4.2",
Expand Down
14 changes: 11 additions & 3 deletions apps/wallet-mobile/src/HW/LedgerConnect/LedgerConnect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as React from 'react'
import type {IntlShape} from 'react-intl'
import {defineMessages, useIntl} from 'react-intl'
import {ActivityIndicator, Alert, FlatList, Image, RefreshControl, ScrollView, StyleSheet, View} from 'react-native'
import {Observer} from 'rxjs'

import bleImage from '../../assets/img/bluetooth.png'
import usbImage from '../../assets/img/ledger-nano-usb.png'
Expand Down Expand Up @@ -64,8 +65,8 @@ class _LedgerConnect extends React.Component<Props, State> {
// as it's just an empty method. Rather, we make sure sate is only
// modified when component is mounted
let previousAvailable = false
TransportBLE.observeState({
next: (e: {available: boolean}) => {
const observer: Observer<{available: boolean; type: string}> = {
next: (e: {available: boolean; type: string}) => {
if (this._isMounted) {
Logger.debug('BLE observeState event', e)
if (this._bluetoothEnabled == null && !e.available) {
Expand All @@ -89,7 +90,14 @@ class _LedgerConnect extends React.Component<Props, State> {
}
}
},
})
error: (e) => {
Logger.error('BLE observeState error', e)
},
complete: () => {
Logger.info('BLE observeState done')
},
}
TransportBLE.observeState(observer)
}
this.startScan()
}
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('hw', () => {
major: 2,
minor: 0,
patch: 4,
flags: {isDebug: false},
flags: {isDebug: false, isAppXS: false},
}
const mockResponse: GetVersionResponse = {
version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,59 @@
"defaultMessage": "!!!Scanning bluetooth devices...",
"file": "src/HW/LedgerConnect/LedgerConnect.tsx",
"start": {
"line": 315,
"line": 323,
"column": 11,
"index": 9898
"index": 10191
},
"end": {
"line": 318,
"line": 326,
"column": 3,
"index": 10032
"index": 10325
}
},
{
"id": "components.walletinit.connectnanox.connectnanoxscreen.introline",
"defaultMessage": "!!!You'll need to:",
"file": "src/HW/LedgerConnect/LedgerConnect.tsx",
"start": {
"line": 319,
"line": 327,
"column": 13,
"index": 10047
"index": 10340
},
"end": {
"line": 322,
"line": 330,
"column": 3,
"index": 10169
"index": 10462
}
},
{
"id": "components.ledger.ledgerconnect.usbDeviceReady",
"defaultMessage": "!!!USB device is ready, please tap on Confirm to continue.",
"file": "src/HW/LedgerConnect/LedgerConnect.tsx",
"start": {
"line": 323,
"line": 331,
"column": 18,
"index": 10189
"index": 10482
},
"end": {
"line": 326,
"line": 334,
"column": 3,
"index": 10334
"index": 10627
}
},
{
"id": "components.walletinit.connectnanox.connectnanoxscreen.error",
"defaultMessage": "!!!An error occurred while trying to connect with your hardware wallet:",
"file": "src/HW/LedgerConnect/LedgerConnect.tsx",
"start": {
"line": 327,
"line": 335,
"column": 9,
"index": 10345
"index": 10638
},
"end": {
"line": 330,
"line": 338,
"column": 3,
"index": 10516
"index": 10809
}
}
]
4 changes: 2 additions & 2 deletions packages/swap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
},
"devDependencies": {
"@commitlint/config-conventional": "^17.0.2",
"@emurgo/yoroi-lib": "0.15.3",
"@emurgo/yoroi-lib": "0.15.6",
"@react-native-async-storage/async-storage": "^1.19.3",
"@react-native-community/eslint-config": "^3.0.2",
"@release-it/conventional-changelog": "^5.0.0",
Expand Down Expand Up @@ -173,7 +173,7 @@
"typescript": "^5.3.3"
},
"peerDependencies": {
"@emurgo/yoroi-lib": "0.15.3",
"@emurgo/yoroi-lib": "0.15.6",
"@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0",
"immer": "^10.0.2",
"react": ">= 16.8.0 <= 19.0.0",
Expand Down
5 changes: 4 additions & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@
"typescript": "^5.3.3"
},
"peerDependencies": {
"axios": "^1.5.0"
"@emurgo/yoroi-lib": "0.15.6",
"axios": "^1.5.0",
"bignumber.js": "^9.0.1",
"rxjs": "^7.8.1"
},
"packageManager": "[email protected]",
"engines": {
Expand Down
Loading
Loading