Skip to content

Commit 95338e5

Browse files
committed
Merge branch v1.51.10
2 parents 721e0c7 + 45276cf commit 95338e5

File tree

281 files changed

+17561
-14152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+17561
-14152
lines changed

.buckconfig

Lines changed: 0 additions & 6 deletions
This file was deleted.

.bundle/config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
BUNDLE_PATH: "vendor/bundle"
2+
BUNDLE_FORCE_RUBY_PLATFORM: 1

.eslintrc.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
module.exports = {
2+
extends: ['standard', 'prettier', 'plugin:react/recommended'],
3+
parser: '@typescript-eslint/parser',
4+
env: {
5+
'mocha': true,
6+
'node': true,
7+
'jest/globals': true
8+
},
9+
plugins: ['sql', 'jest', 'react'],
10+
rules: {
11+
'no-unexpected-multiline': ['warn'],
12+
'max-len': ['error', { code: 650 }],
13+
'no-set-state': 'off',
14+
'react/prop-types': 0,
15+
'no-unused-expressions': 0,
16+
'no-return-assign': 0,
17+
'new-cap': 0,
18+
'dot-notation': 0,
19+
'no-unused-vars': 2
20+
},
21+
settings: {
22+
'import/resolver': {
23+
'babel-module': {}
24+
}
25+
}
26+
}

.eslintrc.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

.flowconfig

Lines changed: 0 additions & 75 deletions
This file was deleted.

.gitignore

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
.idea
2-
.gradle
3-
local.properties
4-
node_modules
5-
npm-debug.log
6-
yarn-error.log
7-
__tests__
8-
__mocks__/axios/*.json
9-
build/
10-
*.iml
1+
# OSX
2+
#
3+
.DS_Store
114

125
# Xcode
136
#
@@ -27,36 +20,51 @@ DerivedData
2720
*.hmap
2821
*.ipa
2922
*.xcuserstate
30-
project.xcworkspace
31-
wallettests
23+
ios/.xcode.env.local
3224

33-
# CocoaPods
34-
ios/Podfile.lock
35-
#
36-
# We recommend against adding the Pods directory to your .gitignore. However
37-
# you should judge for yourself, the pros and cons are mentioned at:
38-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
25+
# Android/IntelliJ
3926
#
40-
ios/Pods
41-
.DS_Store
42-
43-
# BUCK
44-
buck-out/
45-
\.buckd/
27+
build/
28+
.idea
29+
.gradle
30+
local.properties
31+
*.iml
32+
*.hprof
33+
.cxx/
4634
*.keystore
4735
!debug.keystore
4836

37+
# node.js
38+
#
39+
node_modules/
40+
npm-debug.log
41+
yarn-error.log
42+
4943
# fastlane
5044
#
5145
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
5246
# screenshots whenever they are needed.
5347
# For more information about the recommended setup visit:
5448
# https://docs.fastlane.tools/best-practices/source-control/
5549

56-
*/fastlane/report.xml
57-
*/fastlane/Preview.html
58-
*/fastlane/screenshots
50+
**/fastlane/report.xml
51+
**/fastlane/Preview.html
52+
**/fastlane/screenshots
53+
**/fastlane/test_output
5954

6055
# Bundle artifact
6156
*.jsbundle
6257

58+
# Ruby / CocoaPods
59+
/ios/Pods/
60+
/vendor/
61+
62+
# Temporary files created by Metro to check the health of the file watcher
63+
.metro-health-check*
64+
65+
# testing
66+
/coverage
67+
68+
69+
#vscode
70+
.vscode/

.gitlab-ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ variables:
22
LC_ALL: "en_US.UTF-8"
33
LANG: "en_US.UTF-8"
44
GIT_STRATEGY: clone
5-
GIT_SUBMODULE_STRATEGY: recursive
65
GIT_CHECKOUT: "true"
76

87
stages:
@@ -12,13 +11,8 @@ stages:
1211
- deploy
1312
- release
1413
- gopublic
15-
- publicrelease
1614

1715
include:
1816
- project: 'Trustee/walletinternals'
1917
ref: refactor2
2018
file: '/gitlabcicd/wallet-gitlab-ci.yml'
21-
# - project: 'Trustee/walletinternals'
22-
# ref: master
23-
# file: '/githubcicd/wallet-github-ci.yml'
24-

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

.prettierrc.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = {
2+
tabWidth: 4,
3+
singleQuote: true,
4+
jsxSingleQuote: true,
5+
quoteProps: "consistent",
6+
bracketSpacing: true,
7+
jsxBracketSameLine: true,
8+
arrowParens: "always",
9+
trailingComma: "none",
10+
semi: false,
11+
printWidth: 150
12+
}

0 commit comments

Comments
 (0)