Merge branch 'develop' into readme-update

Emurgo · Jun 24, 2022 · cd151d7 · cd151d7
2 parents f139fcc + 9fd239b
commit cd151d7
Show file tree

Hide file tree

Showing 226 changed files with 7,900 additions and 2,872 deletions.
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
@@ -1,4 +1,4 @@
-feature: ['feature/*', '\[feature\]', 'feature\-*']
-fix: ['fix/*', '\[fix\]', 'fix\-*']
-chore: ['chore/*', '\[chore\]', 'chore\-*']
-refactor: ['refactor/*', '\[refactor\]', 'refactor\-*']
+feature: ['feature/*', '\[feature\]', 'feature\-*', 'feature:']
+fix: ['fix/*', '\[fix\]', 'fix\-*', 'fix:']
+chore: ['chore/*', '\[chore\]', 'chore\-*', 'chore:']
+refactor: ['refactor/*', '\[refactor\]', 'refactor\-*', 'refactor:']
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +0,0 @@
-translations
-src/i18n

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         applicationId "com.emurgo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 344
-        versionName "4.7.14"
+        versionCode 347
+        versionName "4.7.15"
         ndk {
           abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }

diff --git a/i18n-unused.config.js b/i18n-unused.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  localesPath: 'src/i18n/locales/',
+  srcPath: 'src'
+}
diff --git a/index.ts b/index.ts
@@ -1,3 +1,4 @@
+import './polyfills'
 import 'react-native-gesture-handler' // required by react-navigation
 import './global'
 import './src/i18n/polyfills' // https://formatjs.io/docs/polyfills

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -629,15 +629,15 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: cb0a244da26421acd471dcb12b563b7d572ce3bb
+  FBReactNativeSpec: 3ae3f4a12646aca43aec4722222dca6e34c09ce7
   Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
   FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
-  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+  glog: 7a8788d88d2a384c05df45e95c5e763e4d81f3ad
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
@@ -647,7 +647,7 @@ SPEC CHECKSUMS:
   Permission-LocationAccuracy: 43d7a6b3d736a90168e9fc7117a721ca44722f83
   Permission-LocationAlways: fbf36cbdcabc3101f1168ad1ec45cfc5a6448cc4
   Permission-LocationWhenInUse: 006c85c8de0c05b5d8be8e8029e4f6b813270293
-  RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
+  RCT-Folly: 91521e05ace43e89980cabd1fb54685f7827ddb9
   RCTRequired: 6d3e854f0e7260a648badd0d44fc364bc9da9728
   RCTTypeSafety: c1f31d19349c6b53085766359caac425926fafaa
   React: bda6b6d7ae912de97d7a61aa5c160db24aa2ad69

diff --git a/ios/emurgo.xcodeproj/project.pbxproj b/ios/emurgo.xcodeproj/project.pbxproj
@@ -1313,7 +1313,7 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1337,7 +1337,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1363,7 +1363,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1386,7 +1386,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1409,7 +1409,7 @@
 				BUNDLE_DISPLAY_NAME = Yoroi;
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1437,7 +1437,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1460,7 +1460,7 @@
 				BUNDLE_DISPLAY_NAME = "Yoroi Staging";
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1488,7 +1488,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1513,7 +1513,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1540,7 +1540,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1563,7 +1563,7 @@
 				BUNDLE_DISPLAY_NAME = "Yoroi Staging";
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1590,7 +1590,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1799,7 +1799,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -1823,7 +1823,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1947,7 +1947,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1970,7 +1970,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2032,7 +2032,7 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -2056,7 +2056,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2081,7 +2081,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
@@ -2105,7 +2105,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2131,7 +2131,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2154,7 +2154,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2178,7 +2178,7 @@
 				BUNDLE_ID_SUFFIX = .staging;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CURRENT_PROJECT_VERSION = 394;
+				CURRENT_PROJECT_VERSION = 398;
 				DEVELOPMENT_TEAM = F8NVT2G2L4;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2201,7 +2201,7 @@
 				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 4.7.14;
+				MARKETING_VERSION = 4.7.15;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/jestSetup.ts b/jestSetup.ts
@@ -19,7 +19,6 @@ jest.mock('@react-native-async-storage/async-storage', () =>
   require('@react-native-async-storage/async-storage/jest/async-storage-mock'),
 )
 jest.mock('react-native-keychain', () => {})
-jest.mock('react-native-vector-icons/MaterialCommunityIcons', () => ({loadFont: jest.fn()}))
 jest.mock('react-native-blockies-svg', () => {})
 
 jest.mock('react-native-reanimated', () => {

diff --git a/package.json b/package.json
@@ -12,6 +12,8 @@
     "e2e:test-android": "detox test -c android.emu.mainnet.release",
     "e2e:test-android-debug": "detox test -c android.emu.mainnet.debug",
     "e2e:test-ios": "detox test -c ios.release",
+    "i18n:missed": "i18n-unused display-missed",
+    "i18n:unused": "i18n-unused display-unused",
     "inhibit-warnings": "react-native-inhibit-warnings",
     "postinstall": "react-native-inhibit-warnings",
     "lint": "yarn lint:typescript && prettylint \"src/**/*.tsx\" \"src/**/*.ts\" \"legacy/**/*.js\" --config .prettierrc",
@@ -22,6 +24,8 @@
     "prettify": "prettier --write ./src ./e2e ./storybook ./translations --config .prettierrc",
     "purge-translations": "rimraf ./translations/messages",
     "setup_configs": "react-native-schemes-manager all",
+    "stag-android": "react-native run-android --variant=devDebug --appIdSuffix=staging",
+    "stag-ios": "react-native run-ios --scheme=emurgo-staging --configuration=Debug",
     "start": "react-native start",
     "prestorybook": "rnstl  --searchDir ./src ./legacy/components ./storybook --pattern '**/*.stories.{js,tsx}'",
     "storybook": "start-storybook",
@@ -80,7 +84,7 @@
     "@emurgo/cip14-js": "2.0.0",
     "@emurgo/cip4-js": "1.0.7",
     "@emurgo/react-native-haskell-shelley": "3.1.3",
-    "@emurgo/yoroi-lib-mobile": "^0.1.5-alpha.20",
+    "@emurgo/yoroi-lib-mobile": "^0.5.0-alpha.31",
     "@formatjs/intl": "^1.14.1",
     "@formatjs/intl-datetimeformat": "^4.2.3",
     "@formatjs/intl-getcanonicallocales": "^1.7.3",
@@ -94,6 +98,7 @@
     "@react-native-community/masked-view": "0.1.10",
     "@react-native-community/netinfo": "5.9.9",
     "@react-navigation/bottom-tabs": "^6.2.0",
+    "@react-navigation/devtools": "^6.0.7",
     "@react-navigation/material-top-tabs": "^6.1.1",
     "@react-navigation/native": "^6.0.8",
     "@react-navigation/routers": "^6.1.0",
@@ -126,6 +131,7 @@
     "node-fetch": "^2.6.1",
     "p-limit": "3.1.0",
     "react": "17.0.2",
+    "react-error-boundary": "^3.1.4",
     "react-intl": "^5.20.10",
     "react-markdown": "4.3.1",
     "react-native": "0.64.2",
@@ -179,7 +185,7 @@
     "@babel/preset-react": "^7.16.7",
     "@babel/runtime": "^7.15.4",
     "@emurgo/cardano-serialization-lib-nodejs": "^9.1.0",
-    "@emurgo/yoroi-lib-core": "^0.1.5-alpha.20",
+    "@emurgo/yoroi-lib-core": "^0.5.0-alpha.31",
     "@storybook/addon-actions": "5.3.14",
     "@storybook/addon-knobs": "5.3.14",
     "@storybook/addon-links": "5.3.14",
@@ -222,6 +228,7 @@
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "extract-react-intl-messages": "^0.14.0",
     "husky": ">=6",
+    "i18n-unused": "^0.8.0",
     "jest": "^27.5.1",
     "jest-circus": "^27.3.1",
     "lint-staged": ">=10",

diff --git a/polyfills.ts b/polyfills.ts
@@ -0,0 +1,3 @@
+Object.fromEntries = Object.fromEntries || ((arr) => arr.reduce((acc, [k, v]) => ((acc[k] = v), acc), {}))
+
+export {}
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
@@ -36,7 +36,7 @@ module.exports = {
     'spaced-comment': 1,
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['error', {argsIgnorePattern: '^_'}],
-    'react/jsx-curly-brace-presence': ['warn', {props: 'never', children: 'never'}]
+    'react/jsx-curly-brace-presence': ['warn', {props: 'never', children: 'never'}],
   },
   globals: {
     Buffer: false,