Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
peachbits committed May 9, 2023
2 parents 3f3e36f + a044f16 commit 9e35d9e
Show file tree
Hide file tree
Showing 113 changed files with 1,310 additions and 1,332 deletions.
63 changes: 63 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,68 @@
# edge-react-gui

## 3.8.0 (2023-04-24)

- Add Algorand (ALGO) and standard asset support
- Add Velodrome DEX support
- Simplex: Add Goole Pay support
- Bity: Migrate to new fiat plugin buy/sell flow
- Added Ethereum ERC20 tokens: (Amp, ApeCoin, Cronos Coin, EnjinCoin, Gala, Game Coin, Graph Token, Healthcare Administration Token, LoopringCoin V2, PlayDapp Token, Quant, SAND, SHIBA INU, Strike Token, SUKU, and Wrapped FIO)
- Move permission checking to end of create flow
- Add live username availability lookup
- Hide balance on request scene if main balance is hidden
- Fix usability issues on FIO onboarding scenes
- Fix eth_signTypedData_v4 support
- Fix corner case that showed incorrect wallet balances display for new wallets
- Fix fiat plugin region restricted error message
- Allow routing to GettingStartedScene from LoginScene
- Add sticky message to row for compromised wallets
- Change default strings export to named export
- Fix unresolved getHistoricalRate promises
- Enable the following lint rules: @typescript-eslint/no-var-requires, typescript-eslint/return-await, and react-hooks/exhaustive-deps
- Fix various visual and usability issues
- Upgrade edge-core-js to v0.19.50
- fixed: Remove check that spentTargets.length > 0 in makeSpend
- Upgrade edge-currency-accountbased to v1.0.1
- fixed: Parse URIs as Tron addresses first before PIX addresses to prevent incorrect parsing of Tron addresses as a PIX address
- PIX: Support minimum amount
- ETH: Add ERC20 tokens
- FIO: Fix new account balance object
- Audit and fix noisy unused address logging
- HBAR/EOS: Fix balance and tx query for new accounts
- Upgrade edge-core-js to v0.21.0
- Replace asMaybe and asOptional cleaner default objects with functions that return new objects
- Upgrade cleaners to v0.3.14
- Add zkSync wallet type
- EVM: Update node lists
- ZEC/ARRR: Update checkpoint files
- Add Algorand (ALGO)
- OP: Add WETH and VELO tokens
- BNB Beacon Chain: Fix transaction date handling
- ARRR: Add unsafeBroadcastTx to info
- EVM: Query info server fees by pluginId
- EVM: Save network fees to engine rather than to disk
- Upgrade edge-currency-plugins to v2.0.2
- Query networkFees endpoint with pluginId instead of currencyCode
- Upgrade edge-login-ui-rn to v1.4.3
- added: OutlinedTextInput prop allowing user edits while spinner is active
- changed: Reduce delay for checking username availability to 400ms
- fixed: Add missing mount check to the first setState in the timeout to check username availability
- fixed: Back on NewAccountPinScene
- fixed: New account username input defocuses when auto-checking for availability
- fixed: Username persistence on back button
- removed: Too much space above brand image on PinLoginScene
- fixed: Reinstate onComplete handling from 1.3
- changed: Update translations
- fixed: Calculation of minLength for legacy recovery questions in login scene
- fixed: Calculation of minLength for legacy recovery questions
- changed: Move "Security Alerts" notification prompt to after account creation is completed
- changed: Update username availability check to be on a per-character-input basis
- added: Add an onComplete prop to the LoginScene component
- changed: Add a back button to the PasswordLoginScene
- changed: Move Help button to the top-right corner for all scenes
- Upgrade edge-exchange-plugins to v0.18.0
- added: Add Velodrome DEX exchange

## 3.7.0 (2023-04-11)

- Engine now run with just public keys and are passed private keys only when necessary
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ dependencies {
// If your app supports Android versions before Ice Cream Sandwich (API level 14)
implementation 'com.facebook.fresco:animated-base-support:1.3.0'
// For animated GIF support
implementation 'com.facebook.fresco:animated-gif:2.6.0'
implementation 'com.facebook.fresco:animated-gif:2.5.0'
}

// Run this once to be able to run the application with BUCK
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 @@ -41,7 +41,7 @@
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme">
<meta-data android:name="com.bugsnag.android.API_KEY"
android:value="BUGSNAG_API_KEY"/>
android:value="a0000000000000000000000000000000"/>
<meta-data android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@mipmap/edge_logo_hollow" />
<activity
Expand Down
22 changes: 14 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ PODS:
- disklet (0.5.2):
- React
- DoubleConversion (1.1.6)
- edge-core-js (0.19.50):
- edge-core-js (0.21.1-1):
- React-Core
- edge-currency-accountbased (1.0.1):
- edge-currency-accountbased (1.2.2-3):
- React-Core
- edge-login-ui-rn (1.4.3):
- edge-login-ui-rn (1.4.5):
- React
- FBLazyVector (0.67.5)
- FBReactNativeSpec (0.67.5):
Expand Down Expand Up @@ -439,9 +439,11 @@ PODS:
- React-Core
- react-native-image-picker (4.0.6):
- React-Core
- react-native-in-app-review (4.3.3):
- React-Core
- react-native-mail (6.1.1):
- React-Core
- react-native-mymonero-core (0.2.7):
- react-native-mymonero-core (0.3.0):
- React-Core
- react-native-netinfo (8.3.0):
- React-Core
Expand Down Expand Up @@ -778,6 +780,7 @@ DEPENDENCIES:
- react-native-contacts (from `../node_modules/react-native-contacts`)
- react-native-flipper (from `../node_modules/react-native-flipper`)
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
- react-native-in-app-review (from `../node_modules/react-native-in-app-review`)
- react-native-mail (from `../node_modules/react-native-mail`)
- react-native-mymonero-core (from `../node_modules/react-native-mymonero-core`)
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
Expand Down Expand Up @@ -960,6 +963,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-flipper"
react-native-image-picker:
:path: "../node_modules/react-native-image-picker"
react-native-in-app-review:
:path: "../node_modules/react-native-in-app-review"
react-native-mail:
:path: "../node_modules/react-native-mail"
react-native-mymonero-core:
Expand Down Expand Up @@ -1084,9 +1089,9 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
edge-core-js: f86376a001cbec16a489fed4e5be43ca51709023
edge-currency-accountbased: 1f60aaec7e62cddea3e03b7fcd17a8fc6af2a6e9
edge-login-ui-rn: 2560af346bfde86fdde30585652ea92e3a2dae40
edge-core-js: 883fe71c669bc46c3a35422c7900c0bfa62b1de8
edge-currency-accountbased: cfd90ca792d9e354c36ff4228c9fb950976df961
edge-login-ui-rn: 61b5d7e0be3389d33f9d520fd43d57e06c918ef9
FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
Expand Down Expand Up @@ -1143,8 +1148,9 @@ SPEC CHECKSUMS:
react-native-contacts: 1bff4c47816d611f26b06fa8b3eaf2db4d1b2c86
react-native-flipper: df8e2a7e5dcc857033d925ad8c7e8c52760b8e06
react-native-image-picker: a6e56460d34905c849ada551db30897dc7f3d535
react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
react-native-mymonero-core: 124750b26da01dceea7b59245b17f50d3c265f40
react-native-mymonero-core: fb1a96736998594ed33935a55b9a39d5394b7a80
react-native-netinfo: 3671b091c4843fda5e153612866ef4024b8f5d62
react-native-piratechain: 21ee59f2a925cab4b84a4d08b833356d7432fe51
react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
Expand Down
2 changes: 1 addition & 1 deletion ios/edge/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>bugsnag</key>
<dict>
<key>apiKey</key>
<string>BUGSNAG_API_KEY</string>
<string>a0000000000000000000000000000000</string>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
Expand Down
4 changes: 4 additions & 0 deletions jestSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ jest.mock('react-native/Libraries/Utilities/Platform', () => ({

jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter')

jest.mock('@react-navigation/elements', () => ({
getDefaultHeaderHeight: () => 44
}))

jest.mock('react-native-gesture-handler', () => ({
PanGestureHandler({ children }) {
return children
Expand Down
20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "3.8.1",
"version": "3.9.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -107,19 +107,19 @@
"base-x": "^4.0.0",
"biggystring": "^4.1.3",
"cleaner-config": "^0.1.9",
"cleaners": "^0.3.13",
"cleaners": "^0.3.16",
"core-js": "^2.5.2",
"csv-stringify": "^5.6.2",
"date-fns": "^2.22.1",
"dateformat": "^3.0.3",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^0.19.50",
"edge-currency-accountbased": "^1.0.1",
"edge-currency-monero": "^0.5.5",
"edge-core-js": "^0.21.1-1",
"edge-currency-accountbased": "^1.2.2-3",
"edge-currency-monero": "^1.0.0",
"edge-currency-plugins": "^2.0.2",
"edge-exchange-plugins": "^0.18.0",
"edge-login-ui-rn": "^1.4.3",
"edge-exchange-plugins": "^0.19.3",
"edge-login-ui-rn": "^1.4.5",
"edge-plugin-bity": "https://github.com/EdgeApp/edge-plugin-bity.git#2a52e6cb86512b98f69f8f5dd3105cdf6d0c2d8a",
"edge-plugin-simplex": "https://github.com/EdgeApp/edge-plugin-simplex.git#b11def82d84f2735b91f4b8104a9e0d3e8c3600d",
"edge-plugin-wyre": "https://github.com/EdgeApp/edge-plugin-wyre.git#28c143cd5828d3444bff62adc224839e33eb0bf9",
Expand All @@ -137,18 +137,20 @@
"react-native-custom-tabs": "https://github.com/adminphoeniixx/react-native-custom-tabs#develop",
"react-native-device-info": "^8.7.1",
"react-native-draggable-flatlist": "^4.0.1",
"react-native-email-link": "^1.14.5",
"react-native-fast-image": "^8.5.11",
"react-native-flipper": "^0.143.0",
"react-native-fs": "^2.19.0",
"react-native-gesture-handler": "^2.4.1",
"react-native-haptic-feedback": "^1.14.0",
"react-native-image-picker": "^4.0.6",
"react-native-in-app-review": "^4.3.3",
"react-native-keyboard-aware-scroll-view": "^0.9.5",
"react-native-linear-gradient": "^2.5.6",
"react-native-localize": "^2.2.1",
"react-native-mail": "^6.1.1",
"react-native-material-textfield": "^0.16.1",
"react-native-mymonero-core": "^0.2.7",
"react-native-mymonero-core": "^0.3.0",
"react-native-patina": "^0.1.6",
"react-native-permissions": "^3.3.1",
"react-native-piratechain": "^0.3.2",
Expand Down Expand Up @@ -242,7 +244,7 @@
"react-native-svg-transformer": "^1.0.0",
"react-test-renderer": "17.0.2",
"readable-stream": "^3.6.0",
"rollup": "^2.79.1",
"rollup": "^3.20.6",
"rollup-plugin-node-resolve": "4.0.0",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
Expand Down
15 changes: 15 additions & 0 deletions patches/react-native-smart-splash-screen+2.3.5.patch
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,21 @@ index dfbd150..6980b86 100644
+ compile 'com.android.support:appcompat-v7:${safeExtGet("supportLibVersion", "23.4.0")}'
compile 'com.facebook.react:react-native:+'
}
diff --git a/node_modules/react-native-smart-splash-screen/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m b/node_modules/react-native-smart-splash-screen/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m
index 278fefd..8868489 100644
--- a/node_modules/react-native-smart-splash-screen/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m
+++ b/node_modules/react-native-smart-splash-screen/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m
@@ -11,6 +11,10 @@ @implementation RCTSplashScreen

RCT_EXPORT_MODULE(SplashScreen)

++ (BOOL)requiresMainQueueSetup
+{
+ return YES;
+}

+ (void)open:(RCTRootView *)v {
[RCTSplashScreen open:v withImageNamed:@"splash"];
diff --git a/node_modules/react-native-smart-splash-screen/react-native-smart-splash-screen.podspec b/node_modules/react-native-smart-splash-screen/react-native-smart-splash-screen.podspec
new file mode 100644
index 0000000..b72b297
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions scripts/cleaners.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { asJSON, asMap, asNumber, asObject, asOptional, asString, asUnknown } from 'cleaners'
import { asJSON, asNumber, asObject, asOptional, asString, asUnknown } from 'cleaners'

/**
* The deploy-config file holds a map of these entries inside itself.
Expand Down Expand Up @@ -27,18 +27,18 @@ export const asReleaseConfig = asObject({
appCenterApiToken: asOptional(asString),
appCenterGroupName: asOptional(asString),
appCenterDistroGroup: asOptional(asString),
ios: asMap(asObject({ appCenterAppName: asString })),
android: asMap(asObject({ appCenterAppName: asString })),
ios: asObject(asObject({ appCenterAppName: asString })),
android: asObject(asObject({ appCenterAppName: asString })),

// Maps from branch names to env.json settings:
envJson: asOptional(asMap(asMap(asUnknown)), {})
envJson: asOptional(asObject(asObject(asUnknown)), () => ({}))
})
export type ReleaseConfig = ReturnType<typeof asReleaseConfig>

/**
* deploy-config.json
*/
export const asReleaseConfigFile = asJSON(asMap(asReleaseConfig))
export const asReleaseConfigFile = asJSON(asObject(asReleaseConfig))
export type ReleaseConfigFile = ReturnType<typeof asReleaseConfigFile>

/**
Expand Down
2 changes: 1 addition & 1 deletion scripts/patchFiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ async function main() {
const bugsnagFiles = ['./android/app/src/main/AndroidManifest.xml', './ios/edge/Info.plist']

for (const file of bugsnagFiles) {
await searchReplace(file, 'BUGSNAG_API_KEY', env.BUGSNAG_API_KEY)
await searchReplace(file, 'a0000000000000000000000000000000', env.BUGSNAG_API_KEY)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/__snapshots__/GuiPlugins.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Settlement: Instant",
"giftcard",
],
"pluginId": "ionia",
"title": "Spend USD -> Earn Crypto",
"title": "Spend USD Earn Crypto",
},
]
`;
Expand Down
Loading

0 comments on commit 9e35d9e

Please sign in to comment.