diff --git a/index.js b/index.js
index 34162fd65..e0045f3f1 100644
--- a/index.js
+++ b/index.js
@@ -4,6 +4,8 @@ import { AppRegistry } from 'react-native'
import { Provider as ReduxProvider } from 'react-redux'
import { PersistGate } from 'redux-persist/integration/react'
import { persistStore } from 'redux-persist'
+import { ThemeProvider } from '@shopify/restyle'
+import { darkThemeColors, theme } from './src/theme/theme'
import App from './src/App'
import { name as appName } from './app.json'
import './src/utils/i18n'
@@ -12,7 +14,6 @@ import AppStorageProvider from './src/storage/AppStorageProvider'
import LanguageProvider from './src/storage/LanguageProvider'
import NotificationStorageProvider from './src/storage/NotificationStorageProvider'
import store from './src/store/store'
-import SolanaProvider from './src/solana/SolanaProvider'
// eslint-disable-next-line no-undef
if (__DEV__) {
@@ -27,13 +28,18 @@ const render = () => {
-
-
+
+
-
-
+
+
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 613bb26c8..99517273c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -61,10 +61,14 @@ PODS:
- glog (0.3.5)
- helium-react-native-sdk (3.0.0):
- React-Core
- - hermes-engine (0.71.5):
- - hermes-engine/Pre-built (= 0.71.5)
- - hermes-engine/Pre-built (0.71.5)
+ - hermes-engine (0.71.10):
+ - hermes-engine/Pre-built (= 0.71.10)
+ - hermes-engine/Pre-built (0.71.10)
- libevent (2.1.12)
+ - lottie-ios (4.3.0)
+ - lottie-react-native (6.3.1):
+ - lottie-ios (~> 4.3.0)
+ - React-Core
- MapboxCommon (23.5.0)
- MapboxCoreMaps (10.13.1):
- MapboxCommon (~> 23.5)
@@ -578,6 +582,7 @@ DEPENDENCIES:
- "helium-react-native-sdk (from `../node_modules/@helium/react-native-sdk`)"
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- libevent (~> 2.1.12)
+ - lottie-react-native (from `../node_modules/lottie-react-native`)
- OneSignalXCFramework (< 4.0, >= 3.0)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -652,6 +657,7 @@ SPEC REPOS:
- Charts
- fmt
- libevent
+ - lottie-ios
- MapboxCommon
- MapboxCoreMaps
- MapboxMaps
@@ -713,6 +719,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@helium/react-native-sdk"
hermes-engine:
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
+ lottie-react-native:
+ :path: "../node_modules/lottie-react-native"
RCT-Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
RCTRequired:
@@ -868,8 +876,10 @@ SPEC CHECKSUMS:
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 791fe035093b84822da7f0870421a25839ca7870
helium-react-native-sdk: 17b612b2dacebc8f10c18ba5611f200a81c940f9
- hermes-engine: 7a53ccac09146018a08239c5425625fdb79a6162
+ hermes-engine: cdb8de7594393b62aaf9eba1877a78afeecac080
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
+ lottie-ios: c69214a487e1a1465a231c1918c6ce174e2d45bc
+ lottie-react-native: c9f1db4f4124dcce9f8159e65d8dc6e8bcb11fb4
MapboxCommon: fdf7fd31c90b7b607cd9c63e37797f023c01d860
MapboxCoreMaps: 24270c7c6b8cb71819fc2f3c549db9620ee4d019
MapboxMaps: cb76511b98d3b95c74b0771ed105bc69f30ace6b
@@ -947,4 +957,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 5b4d3c6d9c5a303c84f0b5427958ba4a25671e76
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
index d062fcf71..fbb2f917d 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
"dependencies": {
"@babel/preset-typescript": "7.21.0",
"@bonfida/spl-name-service": "^1.1.1",
- "@coral-xyz/anchor": "0.26.0",
+ "@coral-xyz/anchor": "0.28.0",
"@gorhom/bottom-sheet": "4.4.6",
"@gorhom/portal": "1.0.14",
"@helium/account-fetch-cache": "^0.3.2",
@@ -58,18 +58,19 @@
"@helium/onboarding": "4.9.0",
"@helium/proto-ble": "4.0.0",
"@helium/react-native-sdk": "^3.0.0",
- "@helium/spl-utils": "^0.3.2",
+ "@helium/spl-utils": "^0.4.1-next.0",
"@helium/transactions": "4.8.1",
"@helium/treasury-management-sdk": "0.1.2",
"@helium/voter-stake-registry-sdk": "0.1.2",
"@helium/wallet-link": "4.10.0",
- "@ledgerhq/hw-app-helium": "6.29.1",
- "@ledgerhq/react-native-hid": "6.28.4",
- "@ledgerhq/react-native-hw-transport-ble": "6.27.2",
+ "@ledgerhq/hw-app-solana": "7.0.13",
+ "@ledgerhq/react-native-hid": "6.30.0",
+ "@ledgerhq/react-native-hw-transport-ble": "6.29.5",
+ "@ledgerhq/types-devices": "^6.22.4",
"@metaplex-foundation/js": "0.17.6",
"@metaplex-foundation/mpl-bubblegum": "0.6.0",
"@onsol/tldparser": "^0.5.3",
- "@pythnetwork/client": "^2.17.0",
+ "@pythnetwork/client": "2.17.0",
"@react-native-async-storage/async-storage": "1.18.1",
"@react-native-community/blur": "4.3.0",
"@react-native-community/checkbox": "0.5.15",
@@ -82,19 +83,19 @@
"@react-navigation/native-stack": "6.7.0",
"@react-navigation/stack": "6.2.2",
"@reduxjs/toolkit": "1.9.1",
- "@rnmapbox/maps": "^10.0.7-rc.0",
+ "@rnmapbox/maps": "10.0.7-rc.0",
"@shopify/restyle": "1.8.0",
"@solana/spl-account-compression": "0.1.4",
- "@solana/spl-memo": "^0.2.3",
+ "@solana/spl-memo": "0.2.3",
"@solana/spl-token": "0.3.6",
- "@solana/spl-token-registry": "^0.2.4574",
- "@solana/wallet-adapter-react": "^0.15.33",
+ "@solana/spl-token-registry": "0.2.4574",
+ "@solana/wallet-adapter-react": "0.15.33",
"@solana/wallet-standard-features": "1.0.0",
"@solana/web3.js": "1.64.0",
"@tradle/react-native-http": "2.0.1",
- "@turf/bbox": "^6.5.0",
- "@turf/center": "^6.5.0",
- "@turf/helpers": "^6.5.0",
+ "@turf/bbox": "6.5.0",
+ "@turf/center": "6.5.0",
+ "@turf/helpers": "6.5.0",
"@walletconnect/react-native-compat": "2.2.1",
"@walletconnect/sign-client": "2.2.1",
"@walletconnect/types": "2.2.1",
@@ -129,11 +130,12 @@
"expo-secure-store": "12.1.1",
"expo-splash-screen": "0.18.2",
"fuse.js": "6.6.2",
- "h3-js": "^4.1.0",
+ "h3-js": "4.1.0",
"https-browserify": "0.0.1",
"i18next": "21.9.1",
"lodash": "4.17.21",
"long": "5.2.0",
+ "lottie-react-native": "^6.3.1",
"parse5": "6.0.1",
"patch-package": "6.4.7",
"path-browserify": "0.0.0",
@@ -161,7 +163,7 @@
"react-native-level-fs": "3.0.1",
"react-native-linear-gradient": "2.6.2",
"react-native-localize": "2.2.3",
- "react-native-mail": "^6.1.1",
+ "react-native-mail": "6.1.1",
"react-native-navigation-bar-color": "2.0.1",
"react-native-network-info": "5.2.1",
"react-native-onesignal": "4.4.1",
@@ -181,7 +183,7 @@
"react-native-svg": "13.4.0",
"react-native-tab-view": "3.3.4",
"react-native-tcp": "3.3.2",
- "react-native-test-flight": "^1.1.0",
+ "react-native-test-flight": "1.1.0",
"react-native-text-ticker": "1.14.0",
"react-native-udp": "2.7.0",
"react-native-video": "5.2.1",
diff --git a/patches/@ledgerhq/hw-transport-mocker+6.27.2.patch b/patches/@ledgerhq/hw-transport-mocker+6.27.2.patch
deleted file mode 100644
index 0a88ba2ff..000000000
--- a/patches/@ledgerhq/hw-transport-mocker+6.27.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/node_modules/@ledgerhq/react-native-hw-transport-ble/lib/BleTransport.js b/node_modules/@ledgerhq/react-native-hw-transport-ble/lib/BleTransport.js
-index 1144799..1ed6531 100644
---- a/node_modules/@ledgerhq/react-native-hw-transport-ble/lib/BleTransport.js
-+++ b/node_modules/@ledgerhq/react-native-hw-transport-ble/lib/BleTransport.js
-@@ -86,8 +86,8 @@ exports.setReconnectionConfig = void 0;
- var hw_transport_1 = __importDefault(require("@ledgerhq/hw-transport"));
- var react_native_ble_plx_1 = require("react-native-ble-plx");
- var devices_1 = require("@ledgerhq/devices");
--var sendAPDU_1 = require("@ledgerhq/devices/ble/sendAPDU");
--var receiveAPDU_1 = require("@ledgerhq/devices/ble/receiveAPDU");
-+var sendAPDU_1 = require("@ledgerhq/devices/lib/ble/sendAPDU");
-+var receiveAPDU_1 = require("@ledgerhq/devices/lib/ble/receiveAPDU");
- var logs_1 = require("@ledgerhq/logs");
- var rxjs_1 = require("rxjs");
- var operators_1 = require("rxjs/operators");
diff --git a/patches/@noble+curves+1.0.0.patch b/patches/@noble+curves+1.0.0.patch
deleted file mode 100644
index f417d7a85..000000000
--- a/patches/@noble+curves+1.0.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/node_modules/@noble/curves/abstract/edwards.js b/node_modules/@noble/curves/abstract/edwards.js
-index 12dcbc7..107b530 100644
---- a/node_modules/@noble/curves/abstract/edwards.js
-+++ b/node_modules/@noble/curves/abstract/edwards.js
-@@ -7,6 +7,12 @@ const modular_js_1 = require("./modular.js");
- const ut = require("./utils.js");
- const utils_js_1 = require("./utils.js");
- const curve_js_1 = require("./curve.js");
-+
-+type BigIntOpInputs = number | bigint;
-+const BigIntPow = (a: BigIntOpInputs, b: BigIntOpInputs) => {
-+ return BigInt(eval(a + 'n ** ' + b + 'n'));
-+}
-+
- // Be friendly to bad ECMAScript parsers by not using bigint literals
- // prettier-ignore
- const _0n = BigInt(0), _1n = BigInt(1), _2n = BigInt(2), _8n = BigInt(8);
-@@ -32,7 +38,7 @@ function validateOpts(curve) {
- function twistedEdwards(curveDef) {
- const CURVE = validateOpts(curveDef);
- const { Fp, n: CURVE_ORDER, prehash: prehash, hash: cHash, randomBytes, nByteLength, h: cofactor, } = CURVE;
-- const MASK = _2n ** BigInt(nByteLength * 8);
-+ const MASK = BigIntPow(_2n, BigInt(nByteLength * 8));
- const modP = Fp.create; // Function overrides
- // sqrt(u/v)
- const uvRatio = CURVE.uvRatio ||
-diff --git a/node_modules/@noble/curves/abstract/weierstrass.js b/node_modules/@noble/curves/abstract/weierstrass.js
-index 11833de..ca0f1a3 100644
---- a/node_modules/@noble/curves/abstract/weierstrass.js
-+++ b/node_modules/@noble/curves/abstract/weierstrass.js
-@@ -2,6 +2,12 @@
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.mapToCurveSimpleSWU = exports.SWUFpSqrtRatio = exports.weierstrass = exports.weierstrassPoints = exports.DER = void 0;
- /*! noble-curves - MIT License (c) 2022 Paul Miller (paulmillr.com) */
-+
-+type BigIntOpInputs = number | bigint;
-+const BigIntPow = (a: BigIntOpInputs, b: BigIntOpInputs) => {
-+ return BigInt(eval(a + 'n ** ' + b + 'n'));
-+}
-+
- // Short Weierstrass curve. The formula is: y² = x³ + ax + b
- const mod = require("./modular.js");
- const ut = require("./utils.js");
-@@ -942,10 +948,10 @@ function SWUFpSqrtRatio(Fp, Z) {
- for (let o = q - _1n; o % _2n === _0n; o /= _2n)
- l += _1n;
- const c1 = l; // 1. c1, the largest integer such that 2^c1 divides q - 1.
-- const c2 = (q - _1n) / _2n ** c1; // 2. c2 = (q - 1) / (2^c1) # Integer arithmetic
-+ const c2 = BigIntPow((q - _1n) / _2n, c1); // 2. c2 = (q - 1) / (2^c1) # Integer arithmetic
- const c3 = (c2 - _1n) / _2n; // 3. c3 = (c2 - 1) / 2 # Integer arithmetic
-- const c4 = _2n ** c1 - _1n; // 4. c4 = 2^c1 - 1 # Integer arithmetic
-- const c5 = _2n ** (c1 - _1n); // 5. c5 = 2^(c1 - 1) # Integer arithmetic
-+ const c4 = BigIntPow(_2n, c1 - _1n); // 4. c4 = 2^c1 - 1 # Integer arithmetic
-+ const c5 = BigIntPow(_2n, (c1 - _1n)); // 5. c5 = 2^(c1 - 1) # Integer arithmetic
- const c6 = Fp.pow(Z, c2); // 6. c6 = Z^c2
- const c7 = Fp.pow(Z, (c2 + _1n) / _2n); // 7. c7 = Z^((c2 + 1) / 2)
- let sqrtRatio = (u, v) => {
diff --git a/src/App.tsx b/src/App.tsx
index dea17011b..cdccaba1e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,6 +1,5 @@
import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
import { PortalHost, PortalProvider } from '@gorhom/portal'
-import { AccountContext } from '@helium/account-fetch-cache-hooks'
import { OnboardingProvider as HotspotOnboardingProvider } from '@helium/react-native-sdk'
import { DarkTheme, NavigationContainer } from '@react-navigation/native'
import MapboxGL from '@rnmapbox/maps'
@@ -28,7 +27,7 @@ import useMount from './hooks/useMount'
import { navigationRef } from './navigation/NavigationHelper'
import RootNavigator from './navigation/RootNavigator'
import './polyfill'
-import { useSolana } from './solana/SolanaProvider'
+import SolanaProvider from './solana/SolanaProvider'
import WalletSignProvider from './solana/WalletSignProvider'
import { useAccountStorage } from './storage/AccountStorageProvider'
import { useNotificationStorage } from './storage/NotificationStorageProvider'
@@ -58,7 +57,7 @@ const App = () => {
const { appState } = useAppState()
const { restored: accountsRestored } = useAccountStorage()
- const { cache } = useSolana()
+ // const { cache } = useSolana()
const { setOpenedNotification } = useNotificationStorage()
const linking = useDeepLinking()
@@ -110,53 +109,51 @@ const App = () => {
-
-
-
-
-
-
-
- {cache && (
+
+
+
+
+
+
+
+
-
- {accountsRestored && (
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )}
-
+ {accountsRestored && (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
- )}
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/components/AccountIcon.tsx b/src/components/AccountIcon.tsx
index 8fbad9b0a..414e10311 100644
--- a/src/components/AccountIcon.tsx
+++ b/src/components/AccountIcon.tsx
@@ -8,10 +8,12 @@ type Props = { address?: string; size: number } & Omit<
>
const AccountIcon = ({ address, ...jazzIconProps }: Props) => {
const seed = useMemo(() => {
+ if (!address) return null
return getJazzSeed(address)
}, [address])
- // eslint-disable-next-line react/jsx-props-no-spreading
+ if (!seed) return null
+
return
}
export default memo(AccountIcon)
diff --git a/src/features/account/AccountActionBar.tsx b/src/features/account/AccountActionBar.tsx
index 032d404f0..04a4939bb 100644
--- a/src/features/account/AccountActionBar.tsx
+++ b/src/features/account/AccountActionBar.tsx
@@ -6,7 +6,6 @@ import { PublicKey } from '@solana/web3.js'
import React, { useCallback, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { LayoutChangeEvent } from 'react-native'
-import { useAccountStorage } from '../../storage/AccountStorageProvider'
import { useAppStorage } from '../../storage/AppStorageProvider'
import { HomeNavigationProp } from '../home/homeTypes'
@@ -48,7 +47,6 @@ const AccountActionBar = ({
const navigation = useNavigation()
const { t } = useTranslation()
const { requirePinForPayment, pin } = useAppStorage()
- const { currentAccount } = useAccountStorage()
const handleAction = useCallback(
(type: Action) => () => {
@@ -104,10 +102,6 @@ const AccountActionBar = ({
return undefined
}, [compact, maxCompact])
- if (currentAccount?.ledgerDevice) {
- return null
- }
-
return (
{
diff --git a/src/features/browser/BrowserWebViewScreen.tsx b/src/features/browser/BrowserWebViewScreen.tsx
index 72a6c9612..91b84e979 100644
--- a/src/features/browser/BrowserWebViewScreen.tsx
+++ b/src/features/browser/BrowserWebViewScreen.tsx
@@ -5,8 +5,7 @@ import {
WebViewMessageEvent,
WebViewNavigation,
} from 'react-native-webview'
-import nacl from 'tweetnacl'
-import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js'
+import { Transaction, VersionedTransaction } from '@solana/web3.js'
import bs58 from 'bs58'
import {
SolanaSignMessageInput,
@@ -24,7 +23,6 @@ import { useSpacing } from '@theme/themeHooks'
import SafeAreaBox from '../../components/SafeAreaBox'
import { useAccountStorage } from '../../storage/AccountStorageProvider'
import injectWalletStandard from './walletStandard'
-import { getKeypair } from '../../storage/secureStorage'
import * as Logger from '../../utils/logger'
import WalletSignBottomSheet from '../../solana/WalletSignBottomSheet'
import {
@@ -36,16 +34,37 @@ import TouchableOpacityBox from '../../components/TouchableOpacityBox'
import Text from '../../components/Text'
import { BrowserNavigationProp, BrowserStackParamList } from './browserTypes'
import useBrowser from '../../hooks/useBrowser'
-import { useSolana } from '../../solana/SolanaProvider'
+import SolanaProvider, { useSolana } from '../../solana/SolanaProvider'
type Route = RouteProp
+export const BrowserWrapper = () => {
+ const isAndroid = useMemo(() => Platform.OS === 'android', [])
+
+ if (isAndroid) {
+ return (
+
+
+
+
+
+ )
+ }
+ return (
+
+
+
+
+
+ )
+}
+
const BrowserWebViewScreen = () => {
const route = useRoute()
const { uri } = route.params
const edges = useMemo(() => ['top', 'bottom'] as Edge[], [])
const { currentAccount } = useAccountStorage()
- const { anchorProvider } = useSolana()
+ const { anchorProvider, signMsg } = useSolana()
const webview = useRef(null)
const walletSignBottomSheetRef = useRef(null)
@@ -80,18 +99,6 @@ const BrowserWebViewScreen = () => {
const { data } = msg.nativeEvent
- const secureAcct = await getKeypair(currentAccount?.address)
- const payer = new PublicKey(currentAccount?.solanaAddress)
-
- if (!secureAcct) {
- throw new Error('Secure account not found')
- }
-
- const signer = {
- publicKey: payer,
- secretKey: secureAcct.privateKey,
- }
-
const { type, inputs } = JSON.parse(data)
if (type === WalletStandardMessageTypes.connect) {
@@ -187,9 +194,10 @@ const BrowserWebViewScreen = () => {
transaction as Transaction,
)
} else {
- const vt = transaction as VersionedTransaction
- vt.sign([signer])
- signedTransaction = vt
+ signedTransaction =
+ await anchorProvider?.wallet.signTransaction(
+ transaction as VersionedTransaction,
+ )
}
if (!signedTransaction) {
@@ -296,9 +304,10 @@ const BrowserWebViewScreen = () => {
transaction as Transaction,
)
} else {
- const vt = transaction as VersionedTransaction
- vt.sign([signer])
- signedTransaction = vt
+ signedTransaction =
+ await anchorProvider?.wallet.signTransaction(
+ transaction as VersionedTransaction,
+ )
}
if (!signedTransaction) {
@@ -351,13 +360,15 @@ const BrowserWebViewScreen = () => {
)
// Sign each message using nacl and return the signature
- const signedMessages = messages.map((message) => {
- const signedMessage = nacl.sign.detached(message, signer.secretKey)
- return {
- signedMessage,
- signature: signedMessage,
- }
- })
+ const signedMessages = await Promise.all(
+ messages.map(async (message) => {
+ const signedMessage = await signMsg(Buffer.from(message))
+ return {
+ signedMessage,
+ signature: signedMessage,
+ }
+ }),
+ )
webview.current?.postMessage(
JSON.stringify({
@@ -369,7 +380,7 @@ const BrowserWebViewScreen = () => {
Logger.breadcrumb('Unknown type', type)
}
},
- [anchorProvider, currentAccount, currentUrl],
+ [anchorProvider, currentAccount, currentUrl, signMsg],
)
const injectedJavascript = useCallback(() => {
@@ -484,57 +495,42 @@ const BrowserWebViewScreen = () => {
)
}, [onBack, onForward, isFavorite, onFavorite, onRefresh])
- const BrowserWrapper = useCallback(
- ({ children }) => {
- if (isAndroid) {
- return {children}
- }
- return <>{children}
- },
- [isAndroid],
- )
-
return (
-
-
- {}}
- >
-
-
-
-
-
-
-
+ {}}>
+
+
+
+
-
-
-
+
+
+
+
+
)
}
diff --git a/src/features/ledger/Animation.tsx b/src/features/ledger/Animation.tsx
new file mode 100644
index 000000000..76e413c7d
--- /dev/null
+++ b/src/features/ledger/Animation.tsx
@@ -0,0 +1,59 @@
+import React from 'react'
+import Lottie from 'lottie-react-native'
+import { AnimationObject } from 'lottie-react-native/lib/typescript/LottieView.types'
+import type { StyleProp, ViewStyle } from 'react-native'
+import { StyleSheet, View } from 'react-native'
+
+// Type predicate function because AnimationObject is only defined as an interface
+// and cannot be checked with `maybeAnimation instanceof AnimationObject` for ex.
+function isAnimationObject(
+ maybeAnimation: unknown,
+): maybeAnimation is AnimationObject {
+ return (
+ (maybeAnimation as AnimationObject).w !== undefined &&
+ (maybeAnimation as AnimationObject).h !== undefined
+ )
+}
+
+export type LottieProps = Lottie['props']
+
+export default function Animation({
+ style,
+ ...lottieProps
+}: LottieProps & {
+ style?: StyleProp
+}) {
+ const { source } = lottieProps
+
+ if (!source) return null
+
+ // Computes the ration w / h because lottie-react-native v6 seems not to compute and apply a ratio anymore.
+ // It will be overridden if the provided style sets one (see below)
+ let aspectRatio = 1
+ if (isAnimationObject(source)) {
+ const { w, h } = source
+
+ if (w && h && h > 0) {
+ aspectRatio = w / h
+ }
+ }
+
+ // The style prop order matters:
+ // Animation prop `style` could define both a width and height, or an aspectRatio, and should override the computed aspectRatio
+ return (
+
+
+
+ )
+}
+
+const styles = StyleSheet.create({
+ default: {
+ width: 300,
+ },
+})
diff --git a/src/features/ledger/DeviceScan.tsx b/src/features/ledger/DeviceScan.tsx
index daeaffe35..a7f4c96b7 100644
--- a/src/features/ledger/DeviceScan.tsx
+++ b/src/features/ledger/DeviceScan.tsx
@@ -187,7 +187,6 @@ const DeviceScan = () => {
diff --git a/src/features/ledger/DeviceShow.tsx b/src/features/ledger/DeviceShow.tsx
index 677a2b33b..49a9276a4 100644
--- a/src/features/ledger/DeviceShow.tsx
+++ b/src/features/ledger/DeviceShow.tsx
@@ -19,7 +19,6 @@ import {
} from './ledgerNavigatorTypes'
import { useAccountStorage } from '../../storage/AccountStorageProvider'
import LedgerAccountListItem, { Section } from './LedgerAccountListItem'
-import { useOnboarding } from '../onboarding/OnboardingProvider'
import { HomeNavigationProp } from '../home/homeTypes'
const MAX_ACCOUNTS = 10
@@ -57,10 +56,6 @@ const DeviceShow = () => {
const spacing = useSpacing()
const colors = useColors()
- const {
- onboardingData: { netType },
- } = useOnboarding()
-
const accountsToAdd = useMemo(
() => newLedgerAccounts.filter((a) => selectedAccounts[a.address]),
@@ -162,7 +157,7 @@ const DeviceShow = () => {
>
-
+
@@ -260,7 +255,7 @@ const DeviceShow = () => {
useAsync(async () => {
try {
- await updateLedgerAccounts(ledgerDevice, netType)
+ await updateLedgerAccounts(ledgerDevice)
} catch (error) {
// in this case, user is likely not on Helium app
@@ -289,6 +284,7 @@ const DeviceShow = () => {
address: acc.address,
ledgerDevice,
ledgerIndex: acc.accountIndex,
+ solanaAddress: acc.solanaAddress,
}
})
diff --git a/src/features/ledger/LedgerAccountListItem.tsx b/src/features/ledger/LedgerAccountListItem.tsx
index b41e40e63..9efa0ccf4 100644
--- a/src/features/ledger/LedgerAccountListItem.tsx
+++ b/src/features/ledger/LedgerAccountListItem.tsx
@@ -8,7 +8,7 @@ import CheckBox from '@react-native-community/checkbox'
import { useColors } from '@theme/themeHooks'
import { humanReadable } from '@utils/solanaUtils'
import React, { memo, useCallback, useMemo } from 'react'
-import { ellipsizeAddress, isTestnet } from '../../utils/accountUtils'
+import { ellipsizeAddress } from '../../utils/accountUtils'
export enum Section {
NEW_ACCOUNT = 0,
@@ -78,9 +78,7 @@ const LedgerAccountListItem = ({
borderTopStartRadius={borderTopStartRadius}
borderBottomEndRadius={borderBottomEndRadius}
borderBottomStartRadius={borderBottomStartRadius}
- backgroundColor={
- isTestnet(account.address) ? 'lividBrown' : 'secondary'
- }
+ backgroundColor="secondary"
>
@@ -94,7 +92,7 @@ const LedgerAccountListItem = ({
adjustsFontSizeToFit
maxFontSizeMultiplier={1.2}
>
- {`${ellipsizeAddress(account.address, {
+ {`${ellipsizeAddress(account.solanaAddress, {
numChars: 4,
})} | ${humanReadable(balance, 8)}`}
diff --git a/src/features/ledger/LedgerConnectSteps.tsx b/src/features/ledger/LedgerConnectSteps.tsx
index 40d2d05cf..97aa35342 100644
--- a/src/features/ledger/LedgerConnectSteps.tsx
+++ b/src/features/ledger/LedgerConnectSteps.tsx
@@ -10,10 +10,9 @@ import TouchableOpacityBox from '@components/TouchableOpacityBox'
type Props = {
onLayout?: (event: LayoutChangeEvent) => void
- error?: Error
onRetry: () => void
}
-const LedgerConnectSteps = ({ onLayout, error, onRetry }: Props) => {
+const LedgerConnectSteps = ({ onLayout, onRetry }: Props) => {
const { t } = useTranslation()
const steps: string[] = t('ledger.connectError.steps', {
returnObjects: true,
@@ -21,7 +20,7 @@ const LedgerConnectSteps = ({ onLayout, error, onRetry }: Props) => {
const { primaryText } = useColors()
return (
-
+
@@ -45,17 +44,8 @@ const LedgerConnectSteps = ({ onLayout, error, onRetry }: Props) => {
))}
-
-
- {error?.toString()}
-
) => void
+
+export type LedgerModalRef = {
+ showLedgerModal: ({
+ transaction,
+ }: {
+ transaction?: Buffer
+ message?: Buffer
+ }) => Promise
+}
+
+type Props = {
+ children: ReactNode
+} & BoxProps
+const LedgerModal = forwardRef(
+ ({ children }: Props, ref: Ref) => {
+ useImperativeHandle(ref, () => ({ showLedgerModal }))
+
+ const { currentAccount } = useAccountStorage()
+ const bottomSheetModalRef = useRef(null)
+ const { backgroundStyle } = useOpacity('surfaceSecondary', 1)
+ const { setIsShowing } = useBackHandler(bottomSheetModalRef)
+ const { secondaryText } = useColors()
+ const { t } = useTranslation()
+ const { getTransport, openSolanaApp } = useLedger()
+ const [transactionBuffer, setTransactionBuffer] = useState()
+ const [messageBuffer, setMessageBuffer] = useState()
+
+ const [ledgerModalState, setLedgerModalState] = useState<
+ 'loading' | 'openApp' | 'sign' | 'enterPinCode' | 'error'
+ >('loading')
+
+ const snapPoints = useMemo(() => ['40%', 'CONTENT_HEIGHT'], [])
+
+ const {
+ animatedHandleHeight,
+ animatedSnapPoints,
+ animatedContentHeight,
+ handleContentLayout,
+ } = useBottomSheetDynamicSnapPoints(snapPoints)
+
+ const openAppAndSign = useCallback(
+ async ({
+ transactionBuffer: tBuffer,
+ messageBuffer: mBuffer,
+ }: {
+ transactionBuffer?: Buffer
+ messageBuffer?: Buffer
+ }) => {
+ if (
+ (!tBuffer && !mBuffer) ||
+ !currentAccount?.ledgerDevice?.id ||
+ !currentAccount?.ledgerDevice?.type ||
+ currentAccount?.accountIndex === undefined
+ ) {
+ return
+ }
+
+ try {
+ setLedgerModalState('loading')
+ bottomSheetModalRef.current?.present()
+ setIsShowing(true)
+
+ const p = new Promise((resolve) => {
+ promiseResolve = resolve
+ })
+
+ let nextTransport = await getTransport(
+ currentAccount.ledgerDevice.id,
+ currentAccount.ledgerDevice.type,
+ )
+
+ if (!nextTransport) {
+ setLedgerModalState('error')
+ // eslint-disable-next-line @typescript-eslint/return-await
+ return p
+ }
+
+ try {
+ setLedgerModalState('openApp')
+ await openSolanaApp(nextTransport)
+ // wait 1 second ledger to open solana app
+ await new Promise((resolve) => setTimeout(resolve, 1000))
+ } catch (error) {
+ const ledgerError = error as Error
+ switch (ledgerError.message) {
+ case 'Ledger device: Locked device (0x5515)':
+ setLedgerModalState('enterPinCode')
+ return p
+ default:
+ break
+ }
+ }
+
+ setLedgerModalState('sign')
+
+ nextTransport = await getTransport(
+ currentAccount.ledgerDevice.id,
+ currentAccount.ledgerDevice.type,
+ )
+
+ if (!nextTransport) {
+ setLedgerModalState('error')
+ // eslint-disable-next-line @typescript-eslint/return-await
+ return p
+ }
+
+ let signature
+
+ if (tBuffer) {
+ signature = await signLedgerTransaction(
+ nextTransport,
+ currentAccount.accountIndex,
+ tBuffer,
+ )
+ } else if (mBuffer) {
+ signature = await signLedgerMessage(
+ nextTransport,
+ currentAccount?.accountIndex,
+ mBuffer,
+ )
+ }
+
+ bottomSheetModalRef.current?.dismiss()
+ return signature
+ } catch (error) {
+ setLedgerModalState('error')
+ const p = new Promise((resolve) => {
+ promiseResolve = resolve
+ })
+ return p
+ }
+ },
+ [currentAccount, setIsShowing, getTransport, openSolanaApp],
+ )
+
+ const showLedgerModal = useCallback(
+ async ({
+ transaction,
+ message,
+ }: {
+ transaction?: Buffer
+ message?: Buffer
+ }) => {
+ if (transaction) {
+ setTransactionBuffer(transaction)
+ }
+ if (message) {
+ setMessageBuffer(message)
+ }
+ return openAppAndSign({
+ transactionBuffer: transaction,
+ messageBuffer: message,
+ })
+ },
+ [openAppAndSign],
+ )
+
+ const renderBackdrop = useCallback(
+ (props) => (
+
+ ),
+ [],
+ )
+
+ const handleIndicatorStyle = useMemo(() => {
+ return {
+ backgroundColor: secondaryText,
+ }
+ }, [secondaryText])
+
+ const deviceModelId = useMemo(() => {
+ let model = DeviceModelId.nanoX
+
+ if (!currentAccount?.ledgerDevice?.name) {
+ return model
+ }
+
+ if (currentAccount?.ledgerDevice?.name.toLowerCase().includes('nano s')) {
+ model = DeviceModelId.nanoS
+ } else if (
+ currentAccount?.ledgerDevice?.name.toLowerCase().includes('nano x')
+ ) {
+ model = DeviceModelId.nanoX
+ } else if (
+ currentAccount?.ledgerDevice?.name.toLowerCase().includes('stax')
+ ) {
+ model = DeviceModelId.stax
+ } else if (
+ currentAccount?.ledgerDevice?.name.toLowerCase().includes('blue')
+ ) {
+ model = DeviceModelId.blue
+ } else if (
+ currentAccount?.ledgerDevice?.name.toLowerCase().includes('nano sp')
+ ) {
+ model = DeviceModelId.nanoSP
+ }
+
+ return model
+ }, [currentAccount?.ledgerDevice?.name])
+
+ const handleRetry = useCallback(async () => {
+ const buffer = await openAppAndSign({
+ transactionBuffer,
+ messageBuffer,
+ })
+
+ if (buffer) {
+ promiseResolve(buffer)
+ }
+ }, [openAppAndSign, transactionBuffer, messageBuffer])
+
+ const onDismiss = useCallback(() => {
+ bottomSheetModalRef.current?.dismiss()
+ }, [])
+
+ const LedgerMessage = useCallback(() => {
+ switch (ledgerModalState) {
+ case 'loading':
+ return null
+ case 'openApp':
+ return (
+
+ {t('ledger.openTheSolanaApp', {
+ device: currentAccount?.ledgerDevice?.name,
+ })}
+
+ )
+ case 'sign':
+ return (
+
+ {t('ledger.pleaseConfirmTransaction', {
+ device: currentAccount?.ledgerDevice?.name,
+ })}
+
+ )
+ case 'enterPinCode':
+ return (
+
+
+ {t('ledger.pleaseEnterPinCode', {
+ device: currentAccount?.ledgerDevice?.name,
+ })}
+
+
+
+ {t('generic.tryAgain')}
+
+
+
+ )
+ case 'error':
+ return null
+ default:
+ return null
+ }
+ }, [currentAccount?.ledgerDevice?.name, handleRetry, ledgerModalState, t])
+
+ return (
+
+
+ {/* */}
+
+
+
+
+
+ {ledgerModalState === 'loading' && (
+
+
+
+ )}
+ {ledgerModalState !== 'loading' && ledgerModalState !== 'error' && (
+ <>
+
+
+
+ {LedgerMessage()}
+
+ )}
+ {ledgerModalState === 'error' && (
+
+ )}
+
+
+ {children}
+ {/* */}
+
+