Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
swansontec committed Mar 30, 2023
2 parents 13fc985 + ace32de commit 9b61b3d
Show file tree
Hide file tree
Showing 156 changed files with 6,240 additions and 4,827 deletions.
19 changes: 1 addition & 18 deletions .github/workflows/asana-attachment.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
name: Asana Attachment

on:
pull_request:
types: [opened, reopened]

jobs:
create-asana-attachment-job:
runs-on: ubuntu-latest
name: Create pull request attachments on Asana tasks
steps:
- name: Create pull request attachments
uses: Asana/create-app-attachment-github-action@latest
id: postAttachment
with:
asana-secret: ${{ secrets.ASANA_SECRET }}
- name: Log output status
run: echo "Status is ${{ steps.postAttachment.outputs.status }}"
# removed
22 changes: 1 addition & 21 deletions .github/workflows/asana-comment.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1 @@
name: Asana Comment

on:
pull_request:
types: [opened, assigned, unassigned, edited, ready_for_review, review_requested]
pull_request_review:
types: [submitted]

jobs:
create-comment-in-asana-task-job:
runs-on: ubuntu-latest
name: Create a comment in Asana Task
steps:
- name: Create a comment
uses: Asana/comment-on-task-github-action@latest
id: createComment
with:
asana-secret: ${{ secrets.ASANA_SECRET }}
comment-text: "{{PR_NAME}} is {{PR_STATE}}: {{PR_URL}}"
- name: Get status
run: echo "Status is ${{ steps.createComment.outputs.status }}"
# removed
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: PR Checks
on: [pull_request]
jobs:
block-wip-pr:
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Block WIP PR
Expand Down
78 changes: 78 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,83 @@
# edge-react-gui

## 3.6.0 (2023-03-28)

- Add new Getting Started flow
- Add Smartpay PIX support
- EOS: Add PowerUp support
- Support deep linking to buy/sell providers
- Prevent sending to unactivated accounts (XRP, DOT, and XLM)
- Show expiration time from parsed URI, if provided
- Add user's receiving address to advanced transaction details scene
- Fix navigation issue when attempting to leave partner plugins
- Fix potential crash when migrating custom tokens
- Replace FlatList with FlashList
- Fix safe area display issues with iPhone 14
- Prevent Optimism from appearing as HBAR activation currency
- Android: Fix occasional crash when refocusing app
- Add event tracking to logs
- Move notification registration to Services
- Various visual fixes
- Update translations
- Upgrade edge-core-js to v0.19.46
- added: Add expireDate to EdgeParsedUri
- Upgrade edge-currency-accountbased to v0.22.21
- Fix fallback value returned when recipient min balance check fails
- XRP: Add additional broadcast error code handling
- EOS: Fix address parsing
- EOS: Replace address regex with greymass sdk regex
- removed: Do not use EdgeCurrencyInfo.defaultSettings to store network info for most chains.
- changed: Upgrade EOS to have power-up support. This will make spending EOS work again.
- changed: Do not allow sending funds to XRP or Polkadot addresses if they would fail to meet activation the reserve requirement.
- Upgrade edge-exchange-plugins to v0.17.7
- Lifi: Use built-in gas limit estimator for Ethereum transactions and not Lifi's
- Upgrade edge-login-ui-rn to v1.2.2
- changed: Change 'new-account' value for initialRoute prop to route to the username screen
- changed: Updated password description verbaige
- changed: Don't require showing acct creds to continue acct creation
- changed: Change wording to not require writing down password on acct creation

## 3.5.0 (2023-03-12)

- Add LiFi DEX aggregator
- Add Optimism
- Update Account Recovery to UI2 theme
- Allow single character currency codes
- Fix AnyPay parsing on send scene
- Fix potential crash when connecting addresses to FIO names
- Fix swap settings not getting saved consistently
- Create a FakeProvider to provide redux to test components
- Change activation payment currencies to use pluginIds
- Change split wallet functionality to use pluginIds instead of currency codes
- Show engine failure error in currency row on failure to load
- Disable Paynow support in SG
- Various visual and text fixes
- Upgrade edge-core-js to v0.19.45
- fixed: Update denominationToNative and nativeToDenomination to look at allTokens, instead of the legacy token lists.
- Upgrade edge-currency-accountbased to v0.22.18
- Fix: Lower Optimism minGasPrice
- HBAR: Update explorer URL
- added: Parse/quote Smartpay PIX QR codes for Tron/USDT
- EVM: Add L1 gas price multiplier
- EVM: Fix nativeAmount calculation when paying an L1 fee
- Add optional checkEnvironment method to OuterPlugin to allow a plugin to fail after loading and during initialization
- EVM: Fix race condition of undefined balance for ETH-based currencies
- ARRR: Update checkpoint files
- Upgrade edge-exchange-plugins to v0.17.6
- added: Add LI.FI DEX exchange.
- added: Add Optimism support across swap plugins
- added: Add default mainnet transcription map
- Lifi: Allow gas price lower than 1 gwei
- LetsExchange: Audit and add special case mainnet codes
- Upgrade edge-login-ui-rn to v1.2.0
- fixed: Missing back button on password recovery login
- added: PublicLoginScreen takes a initialRoute prop to allow for control over the scene that it will initially show
- added: Accessibility hint to Edge logo
- fixed: Safe area for iPhone 14+
- added: Depend on the native @react-native-community/datetimepicker library, which must be installed manually.
- changed: Re-theme the recovery login scenes to match the rest of the app.
- removed: Scene components no longer accept a showHeader prop. With the final scene being themed, this prop no longer does anything.

## 3.4.0 (2023-03-03)

- added: Safety check to see if keys have been uploaded to Edge infrastructure.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protected String getMainComponentName() {
protected void onCreate(Bundle savedInstanceState) {
RCTSplashScreen.openSplashScreen(this);

super.onCreate(savedInstanceState);
super.onCreate(null);
if (getResources().getBoolean(R.bool.portrait_only)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
Expand Down
6 changes: 0 additions & 6 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
files:
- source: /src/locales/strings/enUS.json
translation: /src/locales/strings/%two_letters_code%.json
- source: /localization/AppStoreDescription.txt
translation: /localization/AppStoreDescription.%two_letters_code%.txt
- source: /localization/PlayStoreDescription.txt
translation: /localization/PlayStoreDescription.%two_letters_code%.txt
- source: /localization/ReleaseNotes.txt
translation: /localization/ReleaseNotes.%two_letters_code%.txt
20 changes: 13 additions & 7 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.45):
- edge-core-js (0.19.46):
- React-Core
- edge-currency-accountbased (0.22.18):
- edge-currency-accountbased (0.22.21):
- React-Core
- edge-login-ui-rn (1.2.0):
- edge-login-ui-rn (1.2.2):
- React
- FBLazyVector (0.67.5)
- FBReactNativeSpec (0.67.5):
Expand Down Expand Up @@ -560,6 +560,8 @@ PODS:
- Firebase/Messaging (= 8.15.0)
- React-Core
- RNFBApp
- RNFlashList (1.4.1):
- React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.5.0):
Expand Down Expand Up @@ -809,6 +811,7 @@ DEPENDENCIES:
- "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)"
- "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
- "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
- "RNFlashList (from `../node_modules/@shopify/flash-list`)"
- RNFS (from `../node_modules/react-native-fs`)
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- RNLocalize (from `../node_modules/react-native-localize`)
Expand Down Expand Up @@ -1023,6 +1026,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-firebase/app"
RNFBMessaging:
:path: "../node_modules/@react-native-firebase/messaging"
RNFlashList:
:path: "../node_modules/@shopify/flash-list"
RNFS:
:path: "../node_modules/react-native-fs"
RNGestureHandler:
Expand Down Expand Up @@ -1079,9 +1084,9 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
edge-core-js: 3b4ae090838b2f5927a0e4191619ba1d919f596a
edge-currency-accountbased: 5c9b257f47a5d55fe825c64c9c1cbfca54951f91
edge-login-ui-rn: 3e7b2b4f8835d13698b8b2e74ba7557929e31194
edge-core-js: c1a123dd7dd617e568d8961b2eccee4a64a8a024
edge-currency-accountbased: cc04c152256b12958fbb4bbfc623bc00d1c206fe
edge-login-ui-rn: 8edc8a82230c79cc83b127051dcb395356d4ba3f
FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
Expand Down Expand Up @@ -1171,6 +1176,7 @@ SPEC CHECKSUMS:
RNFBAnalytics: fae7572493095e19d22498650c97507f988e627d
RNFBApp: fd23737680ed2bdde41ca27d8bfb171b6d668c6b
RNFBMessaging: cd273b4dcacf98c83a25ce1711c8c85511573990
RNFlashList: 8ec7f7454721145fe84566bb9e88bcf58981c9fe
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
RNLocalize: cbcb55d0e19c78086ea4eea20e03fe8000bbbced
Expand Down Expand Up @@ -1207,4 +1213,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 2c8eb53f773ad98335ff8c0df91d74e83c87b8d6

COCOAPODS: 1.11.3
COCOAPODS: 1.12.0
3 changes: 3 additions & 0 deletions jestSetup.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { jest } from '@jest/globals'
import mockSafeAreaContext from 'react-native-safe-area-context/jest/mock'

jest.useFakeTimers()

let _nonce = 0
global.nonce = () => _nonce++

jest.mock('react-native-safe-area-context', () => mockSafeAreaContext)

jest.mock('react-native/Libraries/Utilities/Platform', () => ({
OS: 'ios',
isPad: false,
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "3.5.0",
"version": "3.6.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -74,7 +74,6 @@
"process-nextick-args": "2.0.0",
"randombytes": "2.1.0",
"react-native-material-textfield": "0.16.1",
"react-native-safe-area-view": "0.14.9",
"regenerator-runtime": "0.13.2",
"ripemd160": "2.0.2",
"ripple-binary-codec": "0.2.3",
Expand Down Expand Up @@ -102,6 +101,7 @@
"@react-navigation/elements": "^1.3.14",
"@react-navigation/native": "^6.1.3",
"@react-navigation/stack": "^6.3.12",
"@shopify/flash-list": "^1.4.1",
"assert": "^2.0.0",
"async-lock": "^1.1.2",
"base-x": "^4.0.0",
Expand All @@ -114,12 +114,12 @@
"dateformat": "^3.0.3",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^0.19.45",
"edge-currency-accountbased": "^0.22.18",
"edge-core-js": "^0.19.46",
"edge-currency-accountbased": "^0.22.21",
"edge-currency-monero": "^0.5.5",
"edge-currency-plugins": "^1.3.6",
"edge-exchange-plugins": "^0.17.6",
"edge-login-ui-rn": "^1.2.0",
"edge-exchange-plugins": "^0.17.7",
"edge-login-ui-rn": "^1.2.2",
"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 Down Expand Up @@ -157,7 +157,6 @@
"react-native-reanimated": "^2.8.0",
"react-native-safari-view": "^2.1.0",
"react-native-safe-area-context": "^4.5.0",
"react-native-safe-area-view": "0.14.9",
"react-native-screens": "^3.19.0",
"react-native-share": "^7.1.2",
"react-native-smart-splash-screen": "^2.3.5",
Expand Down
70 changes: 0 additions & 70 deletions patches/react-native-safe-area-view+0.14.9.patch

This file was deleted.

Loading

0 comments on commit 9b61b3d

Please sign in to comment.