Merge branch 'staging'

Author: peachbits

.npmrc

@@ -1 +1,3 @@
 @jsr:registry=https://npm.jsr.io
+ignore-scripts=true
+legacy-peer-deps=true

.travis.yml

@@ -9,9 +9,9 @@ node_js:
 before_install:
   - node scripts/hack-travis.mjs
 install:
-  - yarn install --frozen-lockfile --network-concurrency 1
-  - yarn prepare
+  - npm ci
+  - npm run prepare
 script:
-  - yarn lint
-  - yarn tsc
-  - yarn test
+  - npm run lint
+  - npx tsc
+  - npm test

.yarnrc

@@ -2,20 +2,20 @@
 
 ## Package Manager
 
-- **Use Yarn v1** instead of npm for all package management and script execution
-- `yarn install` - Install dependencies
-- `yarn add <package>` - Add new dependency
-- `yarn add -D <package>` - Add dev dependency
+- **Use npm** for all package management and script execution
+- `npm ci` - Install dependencies from the lockfile (CI-style, reproducible)
+- `npm install <package>` - Add new dependency
+- `npm install -D <package>` - Add dev dependency
 
 ## Build/Test/Lint Commands
 
-- `yarn lint` - Run ESLint on entire codebase
-- `yarn fix` - Auto-fix linting issues and deduplicate yarn
-- `yarn test` - Run Jest tests (single run)
-- `yarn watch` - Run Jest tests in watch mode
-- `yarn test --testNamePattern="test name"` - Run specific test by name
-- `yarn verify` - Run lint, typechain, tsc, and test (full verification)
-- `yarn precommit` - Full pre-commit check (localize, lint-staged, tsc, test)
+- `npm run lint` - Run ESLint on entire codebase
+- `npm run fix` - Auto-fix linting issues and dedupe the dependency tree
+- `npm test` - Run Jest tests (single run)
+- `npm run watch` - Run Jest tests in watch mode
+- `npm test -- --testNamePattern="test name"` - Run specific test by name
+- `npm run verify` - Run lint, typechain, tsc, and test (full verification)
+- `npm run precommit` - Full pre-commit check (localize, lint-staged, tsc, test)
 - `tsc` - TypeScript type checking (via package.json script)
 
 ## Code Style Guidelines

AGENTS.md

@@ -2,6 +2,25 @@
 
 ## Unreleased (develop)
 
+## 4.49.0 (staging)
+
+- added: Monero wallet import support
+- added: Monero wallet settings to choose between a Light Wallet Server and a monerod full node backend
+- added: Home screen long-press shortcuts for "⚠️ Save 2FA First!" warning and "Contact Support".
+- added: Honor `af` affiliate parameter on `deep.edge.app` deep links, activating the promotion alongside any inner payload (e.g. private-key import).
+- added: Show swap KYC/terms modal for NExchange
+- added: Nym mixnet warning in Stake, Unstake, and Claim Rewards scenes
+- added: Logbox disable option to env.json
+- added: Reverse-resolve recipient addresses to ENS / Unstoppable Domains / ZNS names in the send flow, address modal, and transaction history.
+- added: Remote enable/disable of gift card providers via the info server's giftCardInfo config, supporting whole-provider disabling for Phaze and Bitrefill and per-brand disabling for Phaze.
+- changed: Migrate Monero to the react-native-monero implementation, replacing edge-currency-monero
+- changed: Migrate package manager from yarn to npm.
+- changed: Deprecate Botanix by switching it to keys-only mode on July 9, 2026.
+- changed: Reorganize the wallet list menu so Asset Settings is reached through Wallet Settings, and rename the Monero "Backend" card to "Server Settings".
+- fixed: Android build failure from the home screen long-press shortcuts feature, caused by an expo-quick-actions Kotlin compile error under Kotlin 2.3.
+- fixed: Use Biometrics toggle in Settings reverting to its previous state after leaving and re-entering the scene.
+- fixed: Prevent imported Monero wallets from using the Edge LWS backend. Choosing to import now prompts the user to continue with a full node or configure a custom LWS server, matching the wallet settings rule.
+
 ## 4.48.2 (2026-06-03)
 
 - changed: Upgrade Zcash sdks for NU6.2 support

CHANGELOG.md

@@ -11,7 +11,7 @@ def preBuildStages(String stageName, versionFile) {
     writeJSON file: './release-version.json', json: versionFile
     currentBuild.description = versionString
 
-    sh 'yarn'
+    sh 'npm ci'
 
     // Import the settings files
     withCredentials([file(credentialsId: 'githubSshKey', variable: 'id_github')]) {
@@ -24,13 +24,13 @@ def preBuildStages(String stageName, versionFile) {
     // Pick the new build number and version from git:
     sh 'node -r sucrase/register ./scripts/updateVersion.ts'
 
-    sh 'yarn prepare'
+    sh 'npm run prepare'
   }
 }
 
 def preTest(String stageName) {
   stage("${stageName}: preTest") {
-    sh 'yarn test --ci'
+    sh 'npm test -- --ci'
   }
 }
 
@@ -108,8 +108,8 @@ pipeline {
             sh "cp ${id_github} ./id_github"
           }
 
-          // Use npm to install Sucrase globally
-          sh 'yarn add --dev sucrase'
+          // Install Sucrase so gitVersionFile.ts can run before the full npm ci below
+          sh 'npm install --save-dev sucrase'
           sh "node -r sucrase/register ./scripts/gitVersionFile.ts ${BRANCH_NAME}"
 
           def versionFile = readJSON file: './release-version.json'

Jenkinsfile

@@ -27,23 +27,17 @@ The React Native documentation contains [detailed instructions on how to prepare
 
 If you are using a Mac, follow both the iOS and Android target instructions. Otherwise, you only need the Android target instructions.
 
-### Install Yarn
-
-This project uses Yarn to manage Javascript dependencies:
-
-    https://yarnpkg.com
-
-Do not use NPM to install dependencies, since that will not work.
-
 ### Checkout develop branch & install node_modules
 
+This project uses npm to manage Javascript dependencies (npm ships with Node).
+
     cd edge-react-gui
-    yarn
-    yarn prepare
+    npm ci
+    npm run prepare
 
 ### Run the bundler
 
-    yarn start
+    npm start
 
 This bundler process needs to run in the background, so feel free to run this in its own terminal window.
 
@@ -57,15 +51,15 @@ Change the `AIRBITZ_API_KEY` in `env.json` to the API key you received from Edge
 
 #### iOS
 
-- Run `yarn prepare.ios` to generate the CocoaPods files. You will need to do this after the first install, and any time Xcode produces a `The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.` error.
+- Run `npm run prepare.ios` to generate the CocoaPods files. You will need to do this after the first install, and any time Xcode produces a `The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.` error.
 - Open `edge-react-gui/ios/edge.xcworkspace` in Xcode
 - Choose a target device or simulator and tap the Play button on the top nav bar
 
 #### Android
 
 To build, install, and start the app on a simulator or physical phone with USB debugging, run:
 
-    yarn android
+    npm run android
 
 Otherwise, to get an APK, do:
 
@@ -109,11 +103,11 @@ Set `BUILD_REPO_URL` to the URL of an empty Git repo that will hold a version
 file that will be auto updated to increment the version and build number. Then
 run the following to update a local `release-version.json` file
 
-    yarn gitVersionFile
+    npm run gitVersionFile
 
 Update the project files based on the version in `release-version.json`
 
-    yarn updateVersion
+    npm run updateVersion
 
 ### Build, sign, and deploy
 
@@ -132,32 +126,51 @@ The included `deploy.ts` is a script to automate building, signing, and deployin
 - Set the `bundleToolPath` in `deploy-config.json` to the path to the bundle tool `.jar` file
 - Put any Android keystore files into `edge-react-gui/keystores/`
 - If using Firebase, put your account's `google-services.json` and `GoogleService-Info.plist` into `edge-react-gui/`
-- Install xcpretty `sudo gem install xcpretty`
+- Install CocoaPods `brew install cocoapods` (use Homebrew, not `gem install`, so it survives Ruby upgrades)
+- Install xcbeautify `brew install xcbeautify`
 
 Run deploy
 
 ```sh
-yarn deploy edge ios master
-yarn deploy edge android master
+npm run deploy edge ios master
+npm run deploy edge android master
 ```
 
 ## Fastlane support
 
-This repo supports utilizing Fastlane to automate updates to iOS Provisioning
-Profiles. To use Fastlane, set the following environment variables and run
-`yarn deploy` as mentioned above
+This repo uses Fastlane to automate iOS code signing. The deploy script uses
+`fastlane match` to install the signing certificates and provisioning profiles,
+and to renew them automatically when they expire (see Certificate renewal
+below).
+
+Fastlane must be version 2.235.0 or newer (install or upgrade with
+`brew install fastlane`). Older versions ignore `--skip_confirmation` during
+`match nuke`, which blocks the automatic certificate renewal on an interactive
+prompt.
+
+Authentication uses an App Store Connect API key, not an Apple ID. Place the key
+JSON at `fastlane.json` in the repo root (see the
+[App Store Connect API docs](https://docs.fastlane.tools/app-store-connect-api/)).
+Then set the following environment variables and run `npm run deploy` as mentioned
+above
 
     BUILD_REPO_URL          // Git repo used to store encrypted provisioning
                             // keys.
                             // Will be shared with the gitVersionFile.ts script
-    FASTLANE_USER           // Apple ID email
-    FASTLANE_PASSWORD       // Apple ID password
     GITHUB_SSH_KEY          // (Optional) SSH Key file to use when accessing
                             // BUILD_REPO_URL
     MATCH_KEYCHAIN_PASSWORD // Password to unlock the current users keychain
     MATCH_PASSWORD          // Password used to encrypt profile information
                             // before being saved to the BUILD_REPO_URL
 
+### Certificate renewal
+
+Apple signing certificates expire once a year. When `fastlane match` fails
+because a certificate is no longer valid, the deploy script automatically nukes
+that certificate type (revoking it on the Apple Developer Portal and wiping it
+from `BUILD_REPO_URL`) and re-runs match to generate a fresh certificate and
+provisioning profiles.
+
 ---
 
 ## Debugging

README.md

@@ -85,6 +85,7 @@
         <data android:scheme="ethereum" />
         <data android:scheme="dash" />
         <data android:scheme="litecoin" />
+        <data android:scheme="zcash" />
       </intent-filter>
       <intent-filter android:label="Wallet Connect">
         <action android:name="android.intent.action.VIEW" />

android/app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@ import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
 import com.zoontek.rnbootsplash.RNBootSplash
+import expo.modules.ReactActivityDelegateWrapper
 
 class MainActivity : ReactActivity() {
   /**
@@ -18,10 +19,16 @@ class MainActivity : ReactActivity() {
 
   /**
    * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
-   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled].
+   * The Expo wrapper forwards activity lifecycle events (onCreate intent capture, onNewIntent)
+   * to expo modules; expo-quick-actions needs it to deliver shortcut taps on cold start.
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
-    DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+    ReactActivityDelegateWrapper(
+      this,
+      BuildConfig.IS_NEW_ARCHITECTURE_ENABLED,
+      DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+    )
 
   // Edge addition
   override fun onCreate(savedInstanceState: Bundle?) {

android/app/src/main/java/co/edgesecure/app/MainActivity.kt

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@mipmap/ic_launcher_foreground"
+    android:inset="18dp" />