Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
swansontec committed Dec 2, 2024
2 parents fad3eee + d8ba2fa commit 3bb77c5
Show file tree
Hide file tree
Showing 90 changed files with 3,178 additions and 4,789 deletions.
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,45 @@

- added: (Zcash) Add NU6 support

## 4.17.0
## 4.18.0

- added: Support for LLD & LLM transaction history
- added: Close button (X) for `EdgeModals,` specifically if a desktop platform is detected.
- changed: Auto-enable required tokens when navigating to `Stake*` scenes
- fixed: Incorrect `SwapInput` amounts on `SwapCreateScene` after changing wallet.
- fixed: Backing up a light account while on the `FiatPluginEnterAmountScene` retains light account-related quote errors
- fixed: Various `EarnScene` display bugs
- fixed: `EarnScene` missing wallet creation option in "Discover" view

## 4.17.0 (2024-11-12)

- 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: Redesign `StakingReturnsCard,` specifically for `StakeOverviewScene`
- changed: `EarnScene` shows all possible stake options, instead of only those for enabled wallets
- changed: `EarnScene` shows one card per stake option if multiple wallets have stake positions on that stake option
- changed: `EarnScene` only intializes stake options once, regardless of re-navigation to the scene
- changed: `FiatProviderError` messages now include `FiatProviderQuoteError` info.
- changed: (Android) Add prompt for user to change battery optimization setting
- 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: Replace deprecated Unstoppable Domains fetch call with SDK
- 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`
- fixed: Fix `currencyWallets` object reference in deep link paths that support wallet creation
- removed: Bank Wire Transfer Buy for Florida
- removed: Paypal Sell for Canada
- removed: Moonpay, Simplex, and Paybis for UK
Expand Down Expand Up @@ -63,7 +80,7 @@
- fixed: ACH sell option for Florida visible with no accepted currencies
- fixed: Slow `TransactionDetailsScene` navigation on slow networks

## 4.15.1 (2024-10-18)
## 4.15.1 (2024-10-21)

- fixed: "Apple Pay" title per latest branding requirements

Expand Down
20 changes: 10 additions & 10 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ PODS:
- DoubleConversion (1.1.6)
- edge-core-js (2.20.1):
- React-Core
- edge-currency-accountbased (4.27.1):
- edge-currency-accountbased (4.28.0):
- React-Core
- edge-currency-plugins (3.4.4):
- React-Core
- edge-exchange-plugins (2.13.0):
- edge-exchange-plugins (2.14.0):
- React-Core
- edge-login-ui-rn (3.23.0):
- edge-login-ui-rn (3.24.0):
- React-Core
- EXApplication (5.1.1):
- ExpoModulesCore
Expand Down Expand Up @@ -534,7 +534,7 @@ PODS:
- React-Core
- RNDateTimePicker (7.2.0):
- React-Core
- RNDeviceInfo (10.11.0):
- RNDeviceInfo (13.2.0):
- React-Core
- RNFastImage (8.5.11):
- React-Core
Expand Down Expand Up @@ -1079,12 +1079,12 @@ SPEC CHECKSUMS:
CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
edge-core-js: 9264309f29f398da3b714dc5e80702f102f9db2d
edge-currency-accountbased: 3ed33409d304a969392c9e205d115521aab49b8a
edge-currency-accountbased: 298a981da054f4d3a1c3600641c150526560db96
edge-currency-plugins: 95577a282061148263207fad9befe11bb07a57c1
edge-exchange-plugins: 896eb55d2a03140bae7b45321efa9e9ac3d3bbe6
edge-login-ui-rn: 58ee453724222a7feac090500587db8cbf2dd083
edge-exchange-plugins: 2883457575c970671c5e63e547907dd40234a323
edge-login-ui-rn: 70f8057108ae213e43583a0b3876c88c500c27bc
EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d
Expand All @@ -1101,7 +1101,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b
Expand Down Expand Up @@ -1162,7 +1162,7 @@ SPEC CHECKSUMS:
RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
RNCPicker: 6d5d64e7b90c240c779ee0938ec433c11e2dd758
RNDateTimePicker: 3942382593f104af226ad9c56e16166960c7ae30
RNDeviceInfo: bf8a32acbcb875f568217285d1793b0e8588c974
RNDeviceInfo: 29e01d5ae94bdb5a0f6c11a4c438132545b4df80
RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
RNFBApp: 9acbe359ef3559d6f8ca5c350db471f2b352f98a
RNFBMessaging: b82ef70d252500d3ad104284c0c7f8e1cd22b51e
Expand Down
14 changes: 14 additions & 0 deletions jestSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,17 @@ jest.mock('use-context-selector', () => {
}
}
})

jest.mock('react-native-device-info', () => {
return {
getDeviceType: jest.fn(),
hasNotch: jest.fn(),
getBuildNumber: jest.fn(),
getVersion: jest.fn()
}
})

jest.mock('react-native-reorderable-list', () => ({
...jest.requireActual('react-native-reorderable-list'),
useReorderableDrag: () => jest.fn()
}))
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "4.17.2",
"version": "4.18.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -81,6 +81,7 @@
"@react-navigation/stack": "^6.3.12",
"@sentry/react-native": "^5.33.1",
"@types/jsrsasign": "^10.5.13",
"@unstoppabledomains/resolution": "^9.3.0",
"@walletconnect/react-native-compat": "^2.11.0",
"@walletconnect/web3wallet": "^1.10.1",
"assert": "^2.0.0",
Expand All @@ -98,12 +99,12 @@
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^2.20.1",
"edge-currency-accountbased": "^4.27.1",
"edge-currency-accountbased": "^4.28.0",
"edge-currency-monero": "^1.3.1",
"edge-currency-plugins": "^3.4.4",
"edge-exchange-plugins": "^2.13.0",
"edge-exchange-plugins": "^2.14.0",
"edge-info-server": "^3.0.1",
"edge-login-ui-rn": "^3.23.0",
"edge-login-ui-rn": "^3.24.0",
"ethers": "^5.7.2",
"expo": "^48.0.0",
"jsrsasign": "^11.1.0",
Expand All @@ -115,13 +116,13 @@
"react": "18.2.0",
"react-native": "0.71.15",
"react-native-airship": "^0.2.12",
"react-native-battery-optimization-check": "^1.0.8",
"react-native-bootsplash": "^4.7.4",
"react-native-camera": "^1.13.1",
"react-native-confetti-cannon": "^1.5.2",
"react-native-contacts": "^7.0.4",
"react-native-custom-tabs": "https://github.com/adminphoeniixx/react-native-custom-tabs#develop",
"react-native-device-info": "^10.11.0",
"react-native-draggable-flatlist": "^4.0.1",
"react-native-device-info": "^13.2.0",
"react-native-email-link": "^1.14.5",
"react-native-fast-image": "^8.5.11",
"react-native-fast-shadow": "^0.1.0",
Expand All @@ -142,8 +143,8 @@
"react-native-patina": "^0.1.6",
"react-native-permissions": "^4.1.5",
"react-native-piratechain": "^0.5.5",
"react-native-power-saving-mode": "^0.1.1",
"react-native-reanimated": "^3.14.0",
"react-native-reorderable-list": "^0.5.0",
"react-native-safari-view": "^2.1.0",
"react-native-safe-area-context": "^4.10.1",
"react-native-screens": "^3.31.1",
Expand Down
Loading

0 comments on commit 3bb77c5

Please sign in to comment.