Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
peachbits committed Nov 13, 2024
2 parents bb97968 + 1018b78 commit 7b099f8
Show file tree
Hide file tree
Showing 181 changed files with 1,357 additions and 1,038 deletions.
36 changes: 28 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,42 @@

## Unreleased

## 4.16.0
## 4.17.0

- added: Add TON
- added: Log swap errors to Sentry.
- added: Tracking for unexpected fiat provider errors.
- added: Add TON support to Banxa, Moonpay, Paybis, and Simplex fiat plugins
- added: Add OSMO support to Moonpay fiat plugin
- added: New post-install survey option for "BTCTKVR Magazine".
- changed: `FiatProviderError` messages now include `FiatProviderQuoteError` info.
- changed: Add explicit gas limit for Kiln staking.
- changed: Various strings updated to UK compliance spec
- changed: Track array of errors or AggregateErrors separately with a common tag
- changed: Use stack-specific scene navigation props instead of `NavigationProp`
- changed: Verbiage for login request scene for QR login has been updated to remove ambiguity.
- changed: Wording in light account persistent notification
- changed: (Android) Allow exporting multiple files
- fixed: Correctly report ETH Kiln balances
- fixed: Fix error massaging in trackError
- fixed: Normalized error messages for tracking; removing localization from error messages.
- fixed: Remove Kado deposit details for "Sell" orders.
- fixed: Sentry tagging and metadata data wasn't formed properly and caused some loss of tracked errors.
- fixed: Use Sentry context for logging metadata in `EdgeCrashEvent`
- removed: Bank Wire Transfer Buy for Florida
- removed: Paypal Sell for Canada
- removed: Moonpay, Simplex, and Paybis for UK
- removed: UK persistent investment risk banner

## 4.16.0 (2024-10-30)

- added: "Transaction Details" button to `SwapSuccessScene`
- added: `WalletRestoreScene`
- added: Button to access the `WalletRestoreScene` on `WalletListScene` if applicable
- added: "Go to Parent Wallet" `WalletListMenuModal` option
- added: Earn Scene
- added: Include wallet creation date in wallet data in log output
- changed: Add explicit gas limit for Kiln staking.
- changed: Allow 0 amount entry in `SpendingLimitsScene`
- changed: Various strings updated to UK compliance spec
- changed: Wording on `SwapSuccessScene`
- changed: `SettingsScene` disables "Restore Wallets" option if there are no wallets to restore
- changed: FIO Home Scene tile replaced with Earn
Expand All @@ -24,16 +49,11 @@
- changed: Navigate to wallet list after restoring wallets
- changed: Update `NotificationCard` to UI4 styling
- changed: Remove legacy non-segwit wallets from new account wallet selection scene
- fixed: Correctly report ETH Kiln balances
- fixed: Deeplinking to `SendScene` may not retain memo information in the resulting broadcast
- fixed: Use account default fiat for transaction fee display in `SweepPrivateKeyCalculateFeeScene`
- fixed: Crash when archiving a wallet that recently accessed the trade modal
- fixed: ACH sell option for Florida visible with no accepted currencies
- fixed: Slow `TransactionDetailsScene` navigation on slow networks
- removed: Moonpay, Simplex, and Paybis for UK
- removed: UK persistent investment risk banner
- removed: Bank Wire Transfer Buy for Florida
- removed: Paypal Sell for Canada

## 4.15.1 (2024-10-18)

Expand Down
24 changes: 12 additions & 12 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ PODS:
- disklet (0.5.2):
- React
- DoubleConversion (1.1.6)
- edge-core-js (2.19.1):
- edge-core-js (2.20.1):
- React-Core
- edge-currency-accountbased (4.26.2):
- edge-currency-accountbased (4.27.1):
- React-Core
- edge-currency-plugins (3.4.3):
- edge-currency-plugins (3.4.4):
- React-Core
- edge-exchange-plugins (2.12.0):
- edge-exchange-plugins (2.13.0):
- React-Core
- edge-login-ui-rn (3.22.5):
- edge-login-ui-rn (3.23.0):
- React-Core
- EXApplication (5.1.1):
- ExpoModulesCore
Expand Down Expand Up @@ -430,7 +430,7 @@ PODS:
- react-native-webview (13.8.4):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-zcash (0.9.1):
- react-native-zcash (0.9.2):
- gRPC-Swift (~> 1.8)
- MnemonicSwift (~> 2.2)
- React-Core
Expand Down Expand Up @@ -1080,11 +1080,11 @@ SPEC CHECKSUMS:
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
edge-core-js: 09206fe34acb8f4eebafe61e8c2eda6cbe81ba69
edge-currency-accountbased: d4ac6411e4d3070606a3d07e0aacfd1e87220030
edge-currency-plugins: 38eaf53c2d9fdbdd30ade3ad09fd698f428f208f
edge-exchange-plugins: 5037e196e652d1dca42afacd86b2395bd0d7f298
edge-login-ui-rn: 33f78f4089a63314ca3d652b0ed235f1e1a1bd4c
edge-core-js: 9264309f29f398da3b714dc5e80702f102f9db2d
edge-currency-accountbased: 3ed33409d304a969392c9e205d115521aab49b8a
edge-currency-plugins: 95577a282061148263207fad9befe11bb07a57c1
edge-exchange-plugins: 896eb55d2a03140bae7b45321efa9e9ac3d3bbe6
edge-login-ui-rn: 58ee453724222a7feac090500587db8cbf2dd083
EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d
Expand Down Expand Up @@ -1141,7 +1141,7 @@ SPEC CHECKSUMS:
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
react-native-safe-area-context: dcab599c527c2d7de2d76507a523d20a0b83823d
react-native-webview: fa228e55c53372c2b361d2fa5e415844fa83eabf
react-native-zcash: c6f228ef34d408d14f38fbd2cf008b9d09b80a78
react-native-zcash: 8d6da0be327896cd68c623e4d261aab0e497276e
React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468
React-RCTAnimation: 7be2c148398eaa5beac950b2b5ec7102389ec3ad
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "4.16.0",
"version": "4.17.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -97,13 +97,13 @@
"deepmerge": "^4.3.1",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^2.19.1",
"edge-currency-accountbased": "^4.26.2",
"edge-core-js": "^2.20.1",
"edge-currency-accountbased": "^4.27.1",
"edge-currency-monero": "^1.3.1",
"edge-currency-plugins": "^3.4.3",
"edge-exchange-plugins": "^2.12.0",
"edge-currency-plugins": "^3.4.4",
"edge-exchange-plugins": "^2.13.0",
"edge-info-server": "^3.0.1",
"edge-login-ui-rn": "^3.22.5",
"edge-login-ui-rn": "^3.23.0",
"ethers": "^5.7.2",
"expo": "^48.0.0",
"jsrsasign": "^11.1.0",
Expand Down Expand Up @@ -141,7 +141,7 @@
"react-native-mymonero-core": "^0.3.1",
"react-native-patina": "^0.1.6",
"react-native-permissions": "^4.1.5",
"react-native-piratechain": "^0.5.3",
"react-native-piratechain": "^0.5.4",
"react-native-power-saving-mode": "^0.1.1",
"react-native-reanimated": "^3.14.0",
"react-native-safari-view": "^2.1.0",
Expand All @@ -156,7 +156,7 @@
"react-native-vector-icons": "^10.1.0",
"react-native-webview": "^13.8.4",
"react-native-wheel-picker-android": "^2.0.6",
"react-native-zcash": "^0.9.1",
"react-native-zcash": "^0.9.2",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"redux-thunk": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/makeNativeHeaders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function makeNativeHeaders() {
// Grab the API key:
let apiKey = 'Error: Set up env.json & re-run scripts/makeNativeHeaders.js'
try {
apiKey = require('../env.json').AIRBITZ_API_KEY
apiKey = require('../env.json').EDGE_API_KEY
} catch (e) {
console.log(apiKey)
}
Expand Down
6 changes: 3 additions & 3 deletions src/__tests__/components/TransactionListTop.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TestRenderer from 'react-test-renderer'
import { TransactionListTop } from '../../components/themed/TransactionListTop'
import { ENV } from '../../env'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeNavigation } from '../../util/fake/fakeSceneProps'
import { fakeCompositeNavigation } from '../../util/fake/fakeSceneProps'

describe('TransactionListTop', () => {
const currencyInfo: EdgeCurrencyInfo = {
Expand Down Expand Up @@ -66,7 +66,7 @@ describe('TransactionListTop', () => {
<FakeProviders initialState={fakeState}>
<TransactionListTop
isEmpty={false}
navigation={fakeNavigation}
navigation={fakeCompositeNavigation}
searching={false}
tokenId={null}
wallet={fakeWallet}
Expand All @@ -87,7 +87,7 @@ describe('TransactionListTop', () => {
<FakeProviders initialState={fakeState}>
<TransactionListTop
isEmpty={false}
navigation={fakeNavigation}
navigation={fakeCompositeNavigation}
searching={false}
tokenId={null}
wallet={fakeWallet}
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/ChangePasswordScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createRenderer } from 'react-test-renderer/shallow'
import { ChangePasswordScene } from '../../components/scenes/ChangePasswordScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeRootState } from '../../util/fake/fakeRootState'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('ChangePasswordScene', () => {
it('should render with loading props', () => {
Expand All @@ -14,7 +14,7 @@ describe('ChangePasswordScene', () => {

const actual = renderer.render(
<FakeProviders initialState={rootState}>
<ChangePasswordScene {...fakeSceneProps('changePassword', undefined)} />
<ChangePasswordScene {...fakeEdgeAppSceneProps('changePassword', undefined)} />
</FakeProviders>
)

Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/ChangePinScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { createRenderer } from 'react-test-renderer/shallow'
import { ChangePinScene } from '../../components/scenes/ChangePinScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeRootState } from '../../util/fake/fakeRootState'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('ChangePinComponent', () => {
it('should render with loading props', () => {
Expand All @@ -14,7 +14,7 @@ describe('ChangePinComponent', () => {

const actual = renderer.render(
<FakeProviders initialState={rootState}>
<ChangePinScene {...fakeSceneProps('changePin', undefined)} />
<ChangePinScene {...fakeEdgeAppSceneProps('changePin', undefined)} />
</FakeProviders>
)

Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CreateWalletAccountSetupScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import TestRenderer from 'react-test-renderer'
import { CreateWalletAccountSetupScene } from '../../components/scenes/CreateWalletAccountSetupScene'
import { btcCurrencyInfo } from '../../util/fake/fakeBtcInfo'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('CreateWalletAccountSelect', () => {
it('renders', () => {
Expand All @@ -26,7 +26,7 @@ describe('CreateWalletAccountSelect', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={mockState}>
<CreateWalletAccountSetupScene
{...fakeSceneProps('createWalletAccountSetup', {
{...fakeEdgeAppSceneProps('createWalletAccountSetup', {
accountHandle: '',
isReactivation: true,
walletId: '332s0ds39f'
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CreateWalletEditNameScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import TestRenderer from 'react-test-renderer'

import { CreateWalletEditNameScene } from '../../components/scenes/CreateWalletEditNameScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('CreateWalletEditNameComponent', () => {
const mockState: FakeState = {
Expand Down Expand Up @@ -54,7 +54,7 @@ describe('CreateWalletEditNameComponent', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={mockState}>
<CreateWalletEditNameScene
{...fakeSceneProps('createWalletEditName', {
{...fakeEdgeAppSceneProps('createWalletEditName', {
createWalletList: [
{
type: 'create',
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CreateWalletImportScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import TestRenderer from 'react-test-renderer'
import { CreateWalletImportScene } from '../../components/scenes/CreateWalletImportScene'
import { defaultAccount } from '../../reducers/CoreReducer'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

jest.mock('react-native-keyboard-aware-scroll-view', () => {
const KeyboardAwareScrollView = (blob: { children: React.ReactNode }) => blob.children
Expand Down Expand Up @@ -33,7 +33,7 @@ describe('CreateWalletImportScene', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={mockState}>
<CreateWalletImportScene
{...fakeSceneProps('createWalletImport', {
{...fakeEdgeAppSceneProps('createWalletImport', {
createWalletList: [
{
type: 'create',
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CreateWalletSelectCryptoScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import TestRenderer from 'react-test-renderer'

import { CreateWalletSelectCryptoScene } from '../../components/scenes/CreateWalletSelectCryptoScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('CreateWalletSelectCrypto', () => {
const mockState: FakeState = {
Expand Down Expand Up @@ -88,7 +88,7 @@ describe('CreateWalletSelectCrypto', () => {
it('should render with loading props', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={mockState}>
<CreateWalletSelectCryptoScene {...fakeSceneProps('createWalletSelectCrypto', {})} />
<CreateWalletSelectCryptoScene {...fakeEdgeAppSceneProps('createWalletSelectCrypto', {})} />
</FakeProviders>
)

Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CurrencyNotificationScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import TestRenderer from 'react-test-renderer'

import { CurrencyNotificationScene } from '../../components/scenes/CurrencyNotificationScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('CurrencyNotificationComponent', () => {
const mockStore: FakeState = {
Expand All @@ -24,7 +24,7 @@ describe('CurrencyNotificationComponent', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={mockStore}>
<CurrencyNotificationScene
{...fakeSceneProps('currencyNotificationSettings', {
{...fakeEdgeAppSceneProps('currencyNotificationSettings', {
currencyInfo: {
pluginId: 'bitcoin',
displayName: 'Bitcoin',
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/CurrencySettings.ui.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import TestRenderer from 'react-test-renderer'
import { CurrencySettingsScene } from '../../components/scenes/CurrencySettingsScene'
import { defaultAccount } from '../../reducers/CoreReducer'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('CurrencySettings', () => {
it('should render', () => {
Expand Down Expand Up @@ -37,7 +37,7 @@ describe('CurrencySettings', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={state}>
<CurrencySettingsScene
{...fakeSceneProps('currencySettings', {
{...fakeEdgeAppSceneProps('currencySettings', {
currencyInfo
})}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/DefaultFiatSettingScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { createRenderer } from 'react-test-renderer/shallow'

import { DefaultFiatSettingComponent } from '../../components/scenes/DefaultFiatSettingScene'
import { getTheme } from '../../components/services/ThemeContext'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('DefaultFiatSettingComponent', () => {
it('should render with loading props', () => {
const renderer = createRenderer()

const actual = renderer.render(
<DefaultFiatSettingComponent
{...fakeSceneProps('defaultFiatSetting', undefined)}
{...fakeEdgeAppSceneProps('defaultFiatSetting', undefined)}
supportedFiats={[
{
label: 'Dollars',
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/EdgeLoginScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TestRenderer from 'react-test-renderer'
import { EdgeLoginScene } from '../../components/scenes/EdgeLoginScene'
import { FakeProviders, FakeState } from '../../util/fake/FakeProviders'
import { fakeRootState } from '../../util/fake/fakeRootState'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

let account: EdgeAccount | undefined

Expand All @@ -17,7 +17,7 @@ describe('EdgeLoginScene', () => {
const renderer = TestRenderer.create(
<FakeProviders initialState={rootState}>
<EdgeLoginScene
{...fakeSceneProps('edgeLogin', {
{...fakeEdgeAppSceneProps('edgeLogin', {
lobbyId: 'AmNsSBDVeF2837'
})}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/scenes/FioAddressDetailsScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createRenderer } from 'react-test-renderer/shallow'

import { FioAddressDetails } from '../../components/scenes/Fio/FioAddressDetailsScene'
import { getTheme } from '../../components/services/ThemeContext'
import { fakeSceneProps } from '../../util/fake/fakeSceneProps'
import { fakeEdgeAppSceneProps } from '../../util/fake/fakeSceneProps'

describe('FioAddressDetails', () => {
it('should render with loading props', () => {
Expand All @@ -24,7 +24,7 @@ describe('FioAddressDetails', () => {

const actual = renderer.render(
<FioAddressDetails
{...fakeSceneProps('fioAddressDetails', {
{...fakeEdgeAppSceneProps('fioAddressDetails', {
fioAddressName: 'Fio@edge',
bundledTxs: 100
})}
Expand Down
Loading

0 comments on commit 7b099f8

Please sign in to comment.