Merge branch v1.51.10

.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

.eslintrc.js

@@ -0,0 +1,26 @@
+module.exports = {
+    extends: ['standard', 'prettier', 'plugin:react/recommended'],
+    parser: '@typescript-eslint/parser',
+    env: {
+        'mocha': true,
+        'node': true,
+        'jest/globals': true
+    },
+    plugins: ['sql', 'jest', 'react'],
+    rules: {
+        'no-unexpected-multiline': ['warn'],
+        'max-len': ['error', { code: 650 }],
+        'no-set-state': 'off',
+        'react/prop-types': 0,
+        'no-unused-expressions': 0,
+        'no-return-assign': 0,
+        'new-cap': 0,
+        'dot-notation': 0,
+        'no-unused-vars': 2
+    },
+    settings: {
+        'import/resolver': {
+            'babel-module': {}
+        }
+    }
+}

.gitignore

@@ -1,13 +1,6 @@
-.idea
-.gradle
-local.properties
-node_modules
-npm-debug.log
-yarn-error.log
-__tests__
-__mocks__/axios/*.json
-build/
-*.iml
+# OSX
+#
+.DS_Store
 
 # Xcode
 #
@@ -27,36 +20,51 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
-wallettests
+ios/.xcode.env.local
 
-# CocoaPods
-ios/Podfile.lock
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+# Android/IntelliJ
 #
-ios/Pods
-.DS_Store
-
-# BUCK
-buck-out/
-\.buckd/
+build/
+.idea
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
 *.keystore
 !debug.keystore
 
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
+
+# testing
+/coverage
+
+
+#vscode
+.vscode/

.gitlab-ci.yml

@@ -2,7 +2,6 @@ variables:
   LC_ALL: "en_US.UTF-8"
   LANG: "en_US.UTF-8"
   GIT_STRATEGY: clone
-  GIT_SUBMODULE_STRATEGY: recursive
   GIT_CHECKOUT: "true"
 
 stages:
@@ -12,13 +11,8 @@ stages:
   - deploy
   - release
   - gopublic
-  - publicrelease
 
 include:
   - project: 'Trustee/walletinternals'
     ref: refactor2
     file: '/gitlabcicd/wallet-gitlab-ci.yml'
-#  - project: 'Trustee/walletinternals'
-#    ref: master
-#    file: '/githubcicd/wallet-github-ci.yml'
-

.prettierrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+  tabWidth: 4,
+  singleQuote: true,
+  jsxSingleQuote: true,
+  quoteProps: "consistent",
+  bracketSpacing: true,
+  jsxBracketSameLine: true,
+  arrowParens: "always",
+  trailingComma: "none",
+  semi: false,
+  printWidth: 150
+}

App.js

@@ -2,41 +2,55 @@
  * @version 0.43
  * Init App
  */
-import React from 'react'
-
+import React, { useEffect } from 'react'
+import SplashScreen from 'react-native-splash-screen'
+import notifee, { EventType } from '@notifee/react-native'
 import { Provider } from 'react-redux'
-import { AppearanceProvider } from 'react-native-appearance'
 import { enableScreens } from 'react-native-screens'
 
 import store from '@app/store'
+import Application from '@app/appstores/Actions/App/App'
 
 import Router from '@app/router'
 import { ThemeProvider } from '@app/theme/ThemeProvider'
 
-import Application from '@app/appstores/Actions/App/App'
+import Log from '@app/services/Log/Log'
+import AppNotificationPopup from '@app/services/AppNotification/AppNotificationPopup'
 
 enableScreens()
 
-export default class App extends React.Component {
-
-    componentDidMount() {
-        Application.init({ source: 'App.mount', onMount : true })
-    }
-
-    componentWillUnmount() {
-        Application.willUnmount()
-    }
-
-    render() {
-        return (
-            <AppearanceProvider>
-                <ThemeProvider>
-                    <Provider store={store}>
-                        <Router />
-                    </Provider>
-                </ThemeProvider>
-            </AppearanceProvider>
-        )
-    }
-
+const App = () => {
+    useEffect(() => {
+        SplashScreen.hide()
+        Application.init({ source: 'App.mount', onMount: true })
+
+        const unsubscribePush = notifee.onForegroundEvent(async (message) => {
+            await Log.log('App.js notifee.useForegroundEvent message ' + JSON.stringify(message))
+            switch (message.type) {
+                case EventType.DISMISSED:
+                    break
+                case EventType.PRESS:
+                    AppNotificationPopup.onOpened(message?.detail?.notification)
+                    break
+            }
+        })
+
+        return () => {
+            if (unsubscribePush) {
+                unsubscribePush()
+            }
+
+            Application.willUnmount()
+        }
+    }, [])
+
+    return (
+        <ThemeProvider>
+            <Provider store={store}>
+                <Router />
+            </Provider>
+        </ThemeProvider>
+    )
 }
+
+export default App

Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby ">= 2.6.10"
+
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'