Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
peachbits committed Feb 27, 2024
2 parents 5347c5f + 195f70e commit 69190d4
Show file tree
Hide file tree
Showing 266 changed files with 5,262 additions and 4,566 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"react-native/no-raw-text": [
"error",
{
"skip": ["B", "EdgeText", "FormattedText"]
"skip": ["B", "EdgeText"]
}
],
"react-native/sort-styles": "off",
Expand Down
31 changes: 29 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,35 @@

## Unreleased

## 4.1.0

- added: FIO conversion analytics events.
- added: Referral information on all analytics events.
- added: Sell to debit card for UK and AU
- added: ACH buy/sell through Kado
- added: Arbitrum One network support
- added: Base network support
- added: Cosmos Hub (ATOM) support
- added: Axelar (AXL) support
- added: Add WalletConnect support for Cosmos-based chains
- changed: Replace A/B test 'legacyLanding' with A/B/C/D test 'landingType'
- changed: Animate buy/sell scenes
- changed: Require Android 9 or above.
- changed: Reword of the CrashScene to help users to force close (not uninstall) Edge
- changed: Updated swipe-able underlay elements for wallet list rows to match UI4
- changed: Upgrade to Android NDK version 26.1.10909125.
- changed: Re-enable fake signup captcha experiment at 50%
- changed: Adjust Transaction List Scene spacings, remove "Transactions" header
- changed: Add a referral ID to share links
- changed: Use `EdgeAsset` for defaultWallets in app config
- fixed: Fix button placement on wallet activation scene
- fixed: Resolved levitating search bar bug on Android
- fixed: Show a useful, localized error message when device doesn't have an email account
- fixed: Make FilledTextInputs take up constant vertical space
- fixed: Send Recipient Address Modal styling when saved recipients are shown
- fixed: Minor Transaction List spacing adjustments
- fixed: Insufficient Funds error in Thorchain unstaking
- removed: swipeLastUsp experiment (always allow swipes on the last USP)

## 4.0.3 (2024-02-15)

Expand All @@ -14,14 +41,14 @@

- fixed: CAPTCHA image was not draggable on Android.

## 4.0.1
## 4.0.1 (2024-02-04)

- fixed: Missing background blurred dots on most scenes
- fixed: Missing promo cards when multiple are on info server
- fixed: Hidden Next button on Change PIN scene
- fixed: Disable auto-capitalization of username when creating account

## 4.0.0
## 4.0.0 (2024-02-02)

- added: `minerTip` to `feeRateUsed` processing
- added: Make the alert drop-down swipeable.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:exported="true"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan">
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
buildscript {
ext {
buildToolsVersion = "33.0.0"
minSdkVersion = 27 // Edge modified from 21
minSdkVersion = 28 // Edge modified from 21
compileSdkVersion = 33
targetSdkVersion = 33

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
ndkVersion = "26.1.10909125"

// Edge addition:
kotlinVersion = "1.8.22"
Expand Down
33 changes: 20 additions & 13 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ PODS:
- disklet (0.5.2):
- React
- DoubleConversion (1.1.6)
- edge-core-js (2.1.1):
- edge-core-js (2.2.1):
- React-Core
- edge-currency-accountbased (3.0.4-1):
- edge-currency-accountbased (3.1.2-3):
- React-Core
- edge-exchange-plugins (2.0.2):
- edge-exchange-plugins (2.1.1):
- React-Core
- edge-login-ui-rn (3.3.2):
- edge-login-ui-rn (3.3.4):
- React-Core
- EXApplication (5.1.1):
- ExpoModulesCore
Expand Down Expand Up @@ -498,6 +498,9 @@ PODS:
- React
- react-native-camera/RN (1.13.1):
- React
- react-native-compat (2.11.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-contacts (7.0.4):
- React-Core
- react-native-flipper (0.143.0):
Expand All @@ -521,7 +524,7 @@ PODS:
- React-Core
- react-native-performance (5.1.0):
- React-Core
- react-native-piratechain (0.4.3):
- react-native-piratechain (0.4.4):
- gRPC-Swift (~> 1.8)
- MnemonicSwift (~> 2.2)
- React-Core
Expand All @@ -536,7 +539,7 @@ PODS:
- ReactCommon/turbomodule/core
- react-native-webview (13.2.2):
- React-Core
- react-native-zcash (0.6.6):
- react-native-zcash (0.6.7):
- gRPC-Swift (~> 1.8)
- MnemonicSwift (~> 2.2)
- React-Core
Expand Down Expand Up @@ -943,6 +946,7 @@ DEPENDENCIES:
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- react-native-camera (from `../node_modules/react-native-camera`)
- "react-native-compat (from `../node_modules/@walletconnect/react-native-compat`)"
- react-native-contacts (from `../node_modules/react-native-contacts`)
- react-native-flipper (from `../node_modules/react-native-flipper`)
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
Expand Down Expand Up @@ -1147,6 +1151,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/logger"
react-native-camera:
:path: "../node_modules/react-native-camera"
react-native-compat:
:path: "../node_modules/@walletconnect/react-native-compat"
react-native-contacts:
:path: "../node_modules/react-native-contacts"
react-native-flipper:
Expand Down Expand Up @@ -1276,10 +1282,10 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
edge-core-js: 53102fb1a760ad57dc526f38951bf8c3883e99fe
edge-currency-accountbased: 551291d782decc785437388f8568514ea63c7abe
edge-exchange-plugins: 4871921ac514b98ccd24c5d49b4bf86b6bdba477
edge-login-ui-rn: 0392e4a33e39c8bf01c66a1a68e2026678a9287c
edge-core-js: 07ef6631aa971d99679098d10171c793e6b94a4a
edge-currency-accountbased: 4b2e848fd3a80276b8d54a867ce525d315c3edb8
edge-exchange-plugins: a457232f9ac76ba4e6508dc670d37e2d48907dd2
edge-login-ui-rn: 45158491c219e2820a6518f2343033390f86d409
EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d
Expand Down Expand Up @@ -1342,6 +1348,7 @@ SPEC CHECKSUMS:
React-jsinspector: 4ade58a6a355d97a53f847543b14f4cb5033cb70
React-logger: 56699550750c013096a11dce3bc996e7dd583835
react-native-camera: b322bc25f47536219473c6d00c666d221f7f2695
react-native-compat: d411b454141009ceca781cd1ca44132cace77c45
react-native-contacts: 1bff4c47816d611f26b06fa8b3eaf2db4d1b2c86
react-native-flipper: df8e2a7e5dcc857033d925ad8c7e8c52760b8e06
react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
Expand All @@ -1353,11 +1360,11 @@ SPEC CHECKSUMS:
react-native-mymonero-core: 780bf854f27a0a905bcef5e7757d2de0a15b4408
react-native-netinfo: 3671b091c4843fda5e153612866ef4024b8f5d62
react-native-performance: cef2b618d47b277fb5c3280b81a3aad1e72f2886
react-native-piratechain: 7576ad2a4f0dd983da3d622f03db89d6a4b54bd7
react-native-piratechain: 2d1baa918b48f0acde635672504296340b039141
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
react-native-webview: b8ec89966713985111a14d6e4bf98d8b54bced0d
react-native-zcash: 42dfb76a142f4c50b368594f22339110a68918b8
react-native-zcash: 18d627d1b559638cfb9cac04207f5460a6010546
React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468
React-RCTAnimation: 7be2c148398eaa5beac950b2b5ec7102389ec3ad
Expand Down Expand Up @@ -1421,4 +1428,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: a84a2c04da9e8c38a3ce0d31af51c1be7866ec59

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
5 changes: 2 additions & 3 deletions jestSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ jest.mock('react-native-keyboard-controller', () => {
useReanimatedKeyboardAnimation: () => ({
height,
progress
})
}),
useKeyboardHandler: handlers => {}
}
})

Expand Down Expand Up @@ -86,8 +87,6 @@ jest.mock('rn-qr-generator', () => ({
}
}))

jest.mock('@react-native-async-storage/async-storage', () => require('@react-native-async-storage/async-storage/jest/async-storage-mock'))

// force timezone to UTC
jest.mock('dateformat', () => (number, format) => require('dateformat')(number, format, true))

Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "4.0.3",
"version": "4.1.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -86,6 +86,7 @@
"bs58check": "2.1.2",
"core-js": "2.5.3",
"create-hash": "1.2.0",
"clipboardy": "3.0.0",
"elliptic": "6.5.4",
"eosjs-api": "https://github.com/EdgeApp/eosjs-api.git#prepare-script",
"hash-base": "3.0.4",
Expand Down Expand Up @@ -123,10 +124,8 @@
"@react-navigation/native": "^6.1.3",
"@react-navigation/stack": "^6.3.12",
"@shopify/flash-list": "^1.6.3",
"@walletconnect/react-native-compat": "^2.9.0",
"@walletconnect/types": "^2.9.0",
"@walletconnect/utils": "^2.9.0",
"@walletconnect/web3wallet": "^1.8.6",
"@walletconnect/react-native-compat": "^2.11.0",
"@walletconnect/web3wallet": "^1.10.1",
"assert": "^2.0.0",
"async-lock": "^1.1.2",
"base-x": "^4.0.0",
Expand All @@ -141,13 +140,13 @@
"deepmerge": "^4.3.1",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^2.1.1",
"edge-currency-accountbased": "^3.0.4-1",
"edge-core-js": "^2.2.1",
"edge-currency-accountbased": "^3.1.2-3",
"edge-currency-monero": "^1.1.1",
"edge-currency-plugins": "^2.5.4",
"edge-exchange-plugins": "^2.0.2",
"edge-info-server": "^1.4.0",
"edge-login-ui-rn": "^3.3.2",
"edge-exchange-plugins": "^2.1.1",
"edge-info-server": "^2.0.0",
"edge-login-ui-rn": "^3.3.4",
"ethers": "^5.7.2",
"expo": "^48.0.0",
"paraswap": "^5.2.0",
Expand Down Expand Up @@ -186,7 +185,7 @@
"react-native-mymonero-core": "^0.3.1",
"react-native-patina": "^0.1.6",
"react-native-permissions": "^3.8.3",
"react-native-piratechain": "^0.4.3",
"react-native-piratechain": "^0.4.4",
"react-native-popup-menu": "^0.16.1",
"react-native-reanimated": "^3.5.4",
"react-native-safari-view": "^2.1.0",
Expand All @@ -199,7 +198,7 @@
"react-native-svg": "^13.9.0",
"react-native-vector-icons": "^7.1.0",
"react-native-webview": "^13.2.2",
"react-native-zcash": "^0.6.6",
"react-native-zcash": "^0.6.7",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"redux-flipper": "^2.0.1",
Expand Down Expand Up @@ -250,6 +249,7 @@
"@types/uuid": "^7.0.0",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"@welldone-software/why-did-you-render": "^8.0.1",
"appcenter-cli": "^2.12.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^29.2.1",
Expand Down
39 changes: 39 additions & 0 deletions patches/react-native-camera+1.13.1.patch
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,42 @@ index bb8f269..572d099 100644
}

@SuppressLint("all")
diff --git a/node_modules/react-native-camera/src/Camera.js b/node_modules/react-native-camera/src/Camera.js
index 9ef36a8..fc4393c 100644
--- a/node_modules/react-native-camera/src/Camera.js
+++ b/node_modules/react-native-camera/src/Camera.js
@@ -9,13 +9,13 @@ import {
StyleSheet,
findNodeHandle,
requireNativeComponent,
- ViewPropTypes,
ActivityIndicator,
View,
Text,
UIManager,
PermissionsAndroid,
} from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';

const requestPermissions = async (
hasVideoAndAudio,
diff --git a/node_modules/react-native-camera/src/RNCamera.js b/node_modules/react-native-camera/src/RNCamera.js
index b1a7d97..740b033 100644
--- a/node_modules/react-native-camera/src/RNCamera.js
+++ b/node_modules/react-native-camera/src/RNCamera.js
@@ -5,7 +5,6 @@ import {
findNodeHandle,
Platform,
NativeModules,
- ViewPropTypes,
requireNativeComponent,
View,
ActivityIndicator,
@@ -13,6 +12,7 @@ import {
StyleSheet,
PermissionsAndroid,
} from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';

import type { FaceFeature } from './FaceDetector';

50 changes: 50 additions & 0 deletions patches/react-native-snap-carousel+3.9.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
diff --git a/node_modules/react-native-snap-carousel/src/carousel/Carousel.js b/node_modules/react-native-snap-carousel/src/carousel/Carousel.js
index dae71a3..4dd36a2 100644
--- a/node_modules/react-native-snap-carousel/src/carousel/Carousel.js
+++ b/node_modules/react-native-snap-carousel/src/carousel/Carousel.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
-import { Animated, Easing, FlatList, I18nManager, Platform, ScrollView, View, ViewPropTypes } from 'react-native';
+import { Animated, Easing, FlatList, I18nManager, Platform, ScrollView, View } from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import shallowCompare from 'react-addons-shallow-compare';
import {
diff --git a/node_modules/react-native-snap-carousel/src/pagination/Pagination.js b/node_modules/react-native-snap-carousel/src/pagination/Pagination.js
index 5c021cf..d300dce 100644
--- a/node_modules/react-native-snap-carousel/src/pagination/Pagination.js
+++ b/node_modules/react-native-snap-carousel/src/pagination/Pagination.js
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
-import { I18nManager, Platform, View, ViewPropTypes } from 'react-native';
+import { I18nManager, Platform, View } from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import PaginationDot from './PaginationDot';
import styles from './Pagination.style';
diff --git a/node_modules/react-native-snap-carousel/src/pagination/PaginationDot.js b/node_modules/react-native-snap-carousel/src/pagination/PaginationDot.js
index e59d196..d2c8dcc 100644
--- a/node_modules/react-native-snap-carousel/src/pagination/PaginationDot.js
+++ b/node_modules/react-native-snap-carousel/src/pagination/PaginationDot.js
@@ -1,5 +1,6 @@
import React, { PureComponent } from 'react';
-import { View, Animated, Easing, TouchableOpacity, ViewPropTypes } from 'react-native';
+import { View, Animated, Easing, TouchableOpacity } from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import styles from './Pagination.style';

diff --git a/node_modules/react-native-snap-carousel/src/parallaximage/ParallaxImage.js b/node_modules/react-native-snap-carousel/src/parallaximage/ParallaxImage.js
index 8bc774a..d6d9de3 100644
--- a/node_modules/react-native-snap-carousel/src/parallaximage/ParallaxImage.js
+++ b/node_modules/react-native-snap-carousel/src/parallaximage/ParallaxImage.js
@@ -1,7 +1,8 @@
// Parallax effect inspired by https://github.com/oblador/react-native-parallax/

import React, { Component } from 'react';
-import { View, ViewPropTypes, Image, Animated, Easing, ActivityIndicator, findNodeHandle } from 'react-native';
+import { View, Image, Animated, Easing, ActivityIndicator, findNodeHandle } from 'react-native';
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
import PropTypes from 'prop-types';
import styles from './ParallaxImage.style';

Loading

0 comments on commit 69190d4

Please sign in to comment.