Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
peachbits committed Dec 13, 2024
2 parents 3bb77c5 + 3468c9a commit f040441
Show file tree
Hide file tree
Showing 62 changed files with 701 additions and 307 deletions.
27 changes: 24 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,36 @@

## Unreleased

## 4.17.2
- changed: Always show Add Wallet button at bottom of asset list
- changed: Use chain icon for staking cards

## 4.19.0

- added: Venmo GUI plugin via Moonpay.
- added: "Add Wallet" button to bottom of `WalletListScene`
- added: `isBuiltInAsset` param for 'Exchange_Shift_Success' tracking event
- added: Show all Zcash addresses on Request scene
- changed: Credit and apply pay payment types changed from Banxa provider.
- changed: Support optional Sideshift private key
- changed: Upgrade edge-core-js to v2.21.0
- changed: Filter CreateWalletItem list by networkLocation instead of tokenId
- changed: Update Ripple base reserve text strings
- changed: Enable `keysOnlyMode` for Binance Beacon Chain
- changed: Always show Add Wallet button at bottom of asset list
- changed: Use chain icon for staking cards
- fixed: Default home/assets scene post-login based on last visited scene
- fixed: Receive flip input default currency selection
- removed: Keyboard autofocus from `WalletListModal`

## 4.17.2 (2024-11-22)

- fixed: (Zcash/Pirate) Fixed android build issues

## 4.17.1
## 4.17.1 (2024-11-20)

- added: (Zcash) Add NU6 support

## 4.18.0
## 4.18.0 (2024-12-02)

- added: Support for LLD & LLM transaction history
- added: Close button (X) for `EdgeModals,` specifically if a desktop platform is detected.
Expand Down
26 changes: 13 additions & 13 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ PODS:
- disklet (0.5.2):
- React
- DoubleConversion (1.1.6)
- edge-core-js (2.20.1):
- edge-core-js (2.21.0):
- React-Core
- edge-currency-accountbased (4.28.0):
- edge-currency-accountbased (4.31.3):
- React-Core
- edge-currency-plugins (3.4.4):
- edge-currency-plugins (3.4.5):
- React-Core
- edge-exchange-plugins (2.14.0):
- edge-exchange-plugins (2.15.1):
- React-Core
- edge-login-ui-rn (3.24.0):
- React-Core
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.4):
- react-native-zcash (0.9.5):
- gRPC-Swift (~> 1.8)
- MnemonicSwift (~> 2.2)
- React-Core
Expand Down Expand Up @@ -1079,11 +1079,11 @@ SPEC CHECKSUMS:
CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
edge-core-js: 9264309f29f398da3b714dc5e80702f102f9db2d
edge-currency-accountbased: 298a981da054f4d3a1c3600641c150526560db96
edge-currency-plugins: 95577a282061148263207fad9befe11bb07a57c1
edge-exchange-plugins: 2883457575c970671c5e63e547907dd40234a323
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
edge-core-js: 10f2bb3facfd5c5dced56cefcda54c90f82799b6
edge-currency-accountbased: d34e32c5bc82a7159c5354c584e470821826ff48
edge-currency-plugins: 797acb6852c2f0a3ccf5e6bde510cc85ee591402
edge-exchange-plugins: fd725d2fbe76ea0cc8eba1711c565f401cfb6c1b
edge-login-ui-rn: 70f8057108ae213e43583a0b3876c88c500c27bc
EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903
EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9
Expand All @@ -1101,7 +1101,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b
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: 722050a75f795ad7edfccf12c81202e42c198c9d
react-native-zcash: b54e07fd36332f8b2fe57e3ae8d76e795e339c9a
React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468
React-RCTAnimation: 7be2c148398eaa5beac950b2b5ec7102389ec3ad
Expand Down Expand Up @@ -1206,4 +1206,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: a604cb59fd3c1007e2f9b5442f05cf33ac324851

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
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.18.0",
"version": "4.19.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -98,11 +98,11 @@
"deepmerge": "^4.3.1",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^2.20.1",
"edge-currency-accountbased": "^4.28.0",
"edge-currency-monero": "^1.3.1",
"edge-currency-plugins": "^3.4.4",
"edge-exchange-plugins": "^2.14.0",
"edge-core-js": "^2.21.0",
"edge-currency-accountbased": "^4.31.3",
"edge-currency-monero": "^1.3.2",
"edge-currency-plugins": "^3.4.5",
"edge-exchange-plugins": "^2.15.1",
"edge-info-server": "^3.0.1",
"edge-login-ui-rn": "^3.24.0",
"ethers": "^5.7.2",
Expand Down Expand Up @@ -142,7 +142,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.5",
"react-native-piratechain": "^0.5.6",
"react-native-reanimated": "^3.14.0",
"react-native-reorderable-list": "^0.5.0",
"react-native-safari-view": "^2.1.0",
Expand All @@ -157,7 +157,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.4",
"react-native-zcash": "^0.9.5",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"redux-thunk": "^2.3.0",
Expand Down
28 changes: 28 additions & 0 deletions src/__tests__/__snapshots__/GuiPlugins.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,20 @@ Limit $1000",
"deepPath": "",
"deepQuery": {},
"description": "Fee: ~5%
Settlement: 5 min - 24 hours",
"paymentType": "venmo",
"paymentTypeLogoKey": "venmo",
"paymentTypes": [
"venmo",
],
"pluginId": "venmo",
"title": "Venmo",
},
{
"cryptoCodes": [],
"deepPath": "",
"deepQuery": {},
"description": "Fee: ~5%
Settlement: 5 min - 24 hours",
"paymentType": "paypal",
"paymentTypeLogoKey": "paypal",
Expand Down Expand Up @@ -308,6 +322,20 @@ Settlement: 2 - 3 days",
"deepPath": "",
"deepQuery": {},
"description": "Fee: ~5%
Settlement: 5 min - 24 hours",
"paymentType": "venmo",
"paymentTypeLogoKey": "venmo",
"paymentTypes": [
"venmo",
],
"pluginId": "venmo",
"title": "Venmo",
},
{
"cryptoCodes": [],
"deepPath": "",
"deepQuery": {},
"description": "Fee: ~5%
Settlement: 5 min - 24 hours",
"paymentType": "paypal",
"paymentTypeLogoKey": "paypal",
Expand Down
7 changes: 7 additions & 0 deletions src/__tests__/actions/TransactionExportActions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '123000000',
networkFee: '1000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress1', 'receiveaddress2'],
parentNetworkFee: '10002',
signedTx: '298t983y4t983y4t93y4g98oeshfgi4t89w394t',
Expand All @@ -45,6 +46,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '-321000000',
networkFee: '2000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
parentNetworkFee: '20001',
signedTx: 'fiuwh34f98h3tiuheirgserg',
Expand All @@ -66,6 +68,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '-321000000',
networkFee: '2000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
isSend: false,
signedTx: 'fiuwh34f98h3tiuheirgserg',
Expand All @@ -87,6 +90,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '321000000',
networkFee: '2000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
isSend: true,
signedTx: 'fiuwh34f98h3tiuheirgserg',
Expand All @@ -109,6 +113,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '-321000000',
networkFee: '0',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
parentNetworkFee: '20001',
signedTx: 'fiuwh34f98h3tiuheirgserg',
Expand All @@ -130,6 +135,7 @@ const edgeTxs: EdgeTransaction[] = [
},
nativeAmount: '-321000000',
networkFee: '2000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
isSend: true,
signedTx: 'fiuwh34f98h3tiuheirgserg',
Expand All @@ -147,6 +153,7 @@ const edgeTxs: EdgeTransaction[] = [
metadata: undefined,
nativeAmount: '-321000000',
networkFee: '2000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress3', 'receiveaddress4'],
signedTx: 'fiuwh34f98h3tiuheirgserg',
tokenId: null,
Expand Down
4 changes: 3 additions & 1 deletion src/__tests__/components/ExchangeQuoteComponent.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ describe('ExchangeQuote', () => {
toNativeAmount: '10000',
networkFee: {
currencyCode: 'BTC',
nativeAmount: '1'
nativeAmount: '1',
tokenId: null
},
pluginId: 'bitcoin',
approve: async () => {
Expand All @@ -109,6 +110,7 @@ describe('ExchangeQuote', () => {
},
nativeAmount: '123000000',
networkFee: '1000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress1', 'receiveaddress2'],
parentNetworkFee: '10002',
signedTx: '298t983y4t983y4t93y4g98oeshfgi4t89w394t',
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/components/TransactionListRow.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ describe('TransactionListRow', () => {
isSend: true,
memos: [],
networkFee: '100000',
networkFees: [],
ourReceiveAddresses: [],
signedTx: '0x12897491827459823745',
tokenId: null,
Expand Down
2 changes: 2 additions & 0 deletions src/__tests__/modals/AccelerateTxModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('AccelerateTxModalComponent', () => {
memos: [],
nativeAmount: '-681',
networkFee: '681',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['123123123'],
signedTx: '',
Expand All @@ -48,6 +49,7 @@ describe('AccelerateTxModalComponent', () => {
memos: [],
nativeAmount: '-1362',
networkFee: '1362',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['123123123'],
signedTx: '',
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/modals/AdvancedDetailsCard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ describe('AdvancedDetailsCard', () => {
memos: [],
nativeAmount: '-681',
networkFee: '681',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['123123123'],
signedTx: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ exports[`WalletListModal should render with loading props 1`] = `
}
}
accessible={true}
autoFocus={true}
autoFocus={false}
disableAnimation={
{
"value": 0,
Expand Down
4 changes: 3 additions & 1 deletion src/__tests__/scenes/SwapConfirmationScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ describe('SwapConfirmationScene', () => {
toNativeAmount: '10000',
networkFee: {
currencyCode: 'BTC',
nativeAmount: '1'
nativeAmount: '1',
tokenId: null
},
pluginId: 'bitcoin',
approve: async () => {
Expand All @@ -119,6 +120,7 @@ describe('SwapConfirmationScene', () => {
},
nativeAmount: '123000000',
networkFee: '1000',
networkFees: [],
ourReceiveAddresses: ['receiveaddress1', 'receiveaddress2'],
parentNetworkFee: '10002',
signedTx: '298t983y4t983y4t93y4g98oeshfgi4t89w394t',
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/scenes/SwapSuccessScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ describe('SwapSuccessSceneComponent', () => {
metadata: { name: 'timmy' },
nativeAmount: '12300000',
networkFee: '1',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['this is an address'],
signedTx: 'this is a signed tx',
Expand Down
2 changes: 2 additions & 0 deletions src/__tests__/scenes/TransactionDetailsScene.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ describe('TransactionDetailsScene', () => {
metadata: { name: 'timmy' },
nativeAmount: '12300000',
networkFee: '1',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['this is an address'],
signedTx: 'this is a signed tx',
Expand Down Expand Up @@ -116,6 +117,7 @@ describe('TransactionDetailsScene', () => {
},
nativeAmount: '-12300000',
networkFee: '1',
networkFees: [],
otherParams: {},
ourReceiveAddresses: ['this is an address'],
signedTx: 'this is a signed tx',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
"currencyCode": "REP",
"displayName": "Augur",
"key": "create-ethereum-1985365e9f78359a9b6ad760e32412f4a445e862",
"networkLocation": {
"contractAddress": "0x1985365e9f78359a9B6AD760e32412f4a445E862",
},
"pluginId": "ethereum",
"tokenId": "1985365e9f78359a9b6ad760e32412f4a445e862",
"type": "create",
Expand All @@ -644,6 +647,9 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
"currencyCode": "REPV2",
"displayName": "Augur v2",
"key": "create-ethereum-221657776846890989a759ba2973e427dff5c9bb",
"networkLocation": {
"contractAddress": "0x221657776846890989a759BA2973e427DfF5C9bB",
},
"pluginId": "ethereum",
"tokenId": "221657776846890989a759ba2973e427dff5c9bb",
"type": "create",
Expand All @@ -655,6 +661,9 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
"currencyCode": "HERC",
"displayName": "Hercules",
"key": "create-ethereum-2e91e3e54c5788e9fdd6a181497fdcea1de1bcc1",
"networkLocation": {
"contractAddress": "0x2e91E3e54C5788e9FdD6A181497FDcEa1De1bcc1",
},
"pluginId": "ethereum",
"tokenId": "2e91e3e54c5788e9fdd6a181497fdcea1de1bcc1",
"type": "create",
Expand All @@ -666,6 +675,9 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
"currencyCode": "DAI",
"displayName": "Dai Stablecoin",
"key": "create-ethereum-6b175474e89094c44da98b954eedeac495271d0f",
"networkLocation": {
"contractAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
},
"pluginId": "ethereum",
"tokenId": "6b175474e89094c44da98b954eedeac495271d0f",
"type": "create",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ exports[`Request should render with loaded props 1`] = `
marginRem={0}
>
<Memo
forceField="crypto"
forceField="fiat"
headerCallback={[Function]}
headerText="Receive to My Bitcoin"
keyboardVisible={false}
Expand Down
Loading

0 comments on commit f040441

Please sign in to comment.