Merge branch 'master' into release-v1.0.8

Author: Jasonvdb

.env.development.template

@@ -13,36 +13,34 @@ ENABLE_MIGRATION_DEBUG=false
 # react-native-ldk JS logs
 ENABLE_LDK_LOGS=true
 
+# Bitkit backend
+BACKEND_HOST=https://bitkit.stag0.blocktank.to
+
 # LDK backups
-BACKUPS_SERVER_HOST=https://blocktank.synonym.to/staging-backups-ldk
+BACKUPS_SERVER_HOST=https://bitkit.stag0.blocktank.to/backups-ldk
 BACKUPS_SERVER_PUBKEY=02c03b8b8c1b5500b622646867d99bf91676fac0f38e2182c91a9ff0d053a21d6d
 
 # Slashtags
 WEB_RELAY=https://webrelay.slashtags.to
 
 # Blocktank
-BLOCKTANK_HOST=https://api1.blocktank.to/api
+BLOCKTANK_HOST=https://api.stag0.blocktank.to/blocktank/api/v2
 
 # Network
 ELECTRUM_BITCOIN_HOST=35.187.18.233
 ELECTRUM_BITCOIN_SSL_PORT=8900
 ELECTRUM_BITCOIN_TCP_PORT=8911
 ELECTRUM_BITCOIN_PROTO=ssl
 
-ELECTRUM_REGTEST_HOST=35.233.47.252
+ELECTRUM_REGTEST_HOST=34.65.86.104
 ELECTRUM_REGTEST_SSL_PORT=18484
 ELECTRUM_REGTEST_TCP_PORT=18483
 ELECTRUM_REGTEST_PROTO=tcp
 
-ELECTRUM_SIGNET_HOST=35.233.47.252
-ELECTRUM_SIGNET_SSL_PORT=18484
-ELECTRUM_SIGNET_TCP_PORT=18483
-ELECTRUM_SIGNET_PROTO=tcp
-
 TREASURE_HUNT_HOST=" "
 
 # format: "<pubkey>, <pubkey>, ..."
-TRUSTED_ZERO_CONF_PEERS="0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
+TRUSTED_ZERO_CONF_PEERS="028a8910b0048630d4eb17af25668cdd7ea6f2d8ae20956e7a06e2ae46ebcb69fc,0296b2db342fcf87ea94d981757fdf4d3e545bd5cef4919f58b5d38dfdd73bf5c9,03b9a456fb45d5ac98c02040d39aec77fa3eeb41fd22cf40b862b393bcfc43473a,039b8b4dd1d88c2c5db374290cda397a8f5d79f312d6ea5d5bfdfc7c6ff363eae3,03342eac98d8c07ac8a4f303b2ad09a34b3350357730013d534d0537a4d1d8a14d,03816141f1dce7782ec32b66a300783b1d436b19777e7c686ed00115bd4b88ff4b"
 
 WALLET_DEFAULT_SELECTED_NETWORK=bitcoin
 

.env.test.template

@@ -13,6 +13,9 @@ ENABLE_MIGRATION_DEBUG=false
 # react-native-ldk JS logs
 ENABLE_LDK_LOGS=false
 
+# Bitkit backend
+BACKEND_HOST=https://bitkit.stag0.blocktank.to
+
 # LDK backups
 BACKUPS_SERVER_HOST=http://127.0.0.1:3003
 BACKUPS_SERVER_PUBKEY=0319c4ff23820afec0c79ce3a42031d7fef1dff78b7bdd69b5560684f3e1827675
@@ -34,11 +37,6 @@ ELECTRUM_REGTEST_SSL_PORT=60001
 ELECTRUM_REGTEST_TCP_PORT=60001
 ELECTRUM_REGTEST_PROTO=tcp
 
-ELECTRUM_SIGNET_HOST=35.233.47.252
-ELECTRUM_SIGNET_SSL_PORT=18484
-ELECTRUM_SIGNET_TCP_PORT=18483
-ELECTRUM_SIGNET_PROTO=tcp
-
 TREASURE_HUNT_HOST=" "
 
 # format: "<pubkey>, <pubkey>, ..."

.eslintignore

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 jobs:
-  eslint:
+  lint:
     name: Run lint check
     runs-on: ubuntu-latest
 

.eslintrc.js

@@ -60,3 +60,9 @@ file_filter  = src/utils/i18n/locales/<lang>/wallet.json
 source_file  = src/utils/i18n/locales/en/wallet.json
 source_lang  = en
 type         = STRUCTURED_JSON
+
+[o:synonym:p:bitkit:r:widgets]
+file_filter  = src/utils/i18n/locales/<lang>/widgets.json
+source_file  = src/utils/i18n/locales/en/widgets.json
+source_lang  = en
+type         = STRUCTURED_JSON

.github/workflows/lint-check.yml

@@ -67,7 +67,7 @@ describe('Todos selector', () => {
 
 	it('should not return backupSeedPhraseTodo if backup is verified', () => {
 		const state = cloneDeep(s);
-		state.user.backupVerified = true;
+		state.settings.backupVerified = true;
 
 		expect(todosFullSelector(state)).not.toEqual(
 			expect.arrayContaining([backupSeedPhraseTodo]),

.prettierrc.js

@@ -1,11 +1,8 @@
-const { types } = require('@babel/core');
 const { E2E_TESTS } = process.env;
 
 module.exports = {
 	presets: ['module:@react-native/babel-preset'],
 	plugins: [
-		// Support bigint literal `0n`
-		transformBigIntLiteral,
 		// Support `for await () {}`
 		'@babel/plugin-proposal-async-generator-functions',
 		[
@@ -25,17 +22,3 @@ module.exports = {
 		},
 	},
 };
-
-// Copied from unsupported https://github.com/babel/babel/pull/10102/files
-function transformBigIntLiteral() {
-	return {
-		visitor: {
-			BigIntLiteral(path) {
-				const bigintCall = types.callExpression(types.identifier('BigInt'), [
-					types.stringLiteral(path.node.value),
-				]);
-				path.replaceWith(bigintCall);
-			},
-		},
-	};
-}

.tx/config

@@ -0,0 +1,39 @@
+{
+	"files": {
+		"ignore": ["src/polyfills/**"]
+	},
+	"linter": {
+		"rules": {
+			"complexity": {
+				"noBannedTypes": "off",
+				"noForEach": "off"
+			},
+			"nursery": {
+				"useExplicitType": "off"
+			},
+			"correctness": {
+				"noUnusedFunctionParameters": "error",
+				"noUnusedVariables": "error"
+			},
+			"performance": {
+				"noAccumulatingSpread": "off"
+			},
+			"suspicious": {
+				"noExplicitAny": "off",
+				"noArrayIndexKey": "off"
+			},
+			"style": {
+				"noNonNullAssertion": "off",
+				"noParameterAssign": "off",
+				"useImportType": "off",
+				"useNodejsImportProtocol": "off"
+			}
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"bracketSameLine": true,
+			"quoteStyle": "single"
+		}
+	}
+}