Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve status and navigation bar colors #2186

Merged
merged 1 commit into from
May 22, 2024
Merged

Improve status and navigation bar colors #2186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,107 changes: 583 additions & 524 deletions App.tsx
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
"react-native-status-bar-height": "2.6.0",
"react-native-svg": "14.1.0",
"react-native-svg-transformer": "1.3.0",
"react-native-system-navigation-bar": "2.6.4",
"react-native-tcp": "aprock/react-native-tcp#be5f656",
"react-native-tor": "0.1.8",
"react-native-udp": "4.1.7",
Expand Down
93 changes: 49 additions & 44 deletions stores/SettingsStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { action, observable } from 'mobx';
import { BiometryType } from 'react-native-biometrics';
import ReactNativeBlobUtil from 'react-native-blob-util';
import EncryptedStorage from 'react-native-encrypted-storage';
import isEqual from 'lodash/isEqual';

import BackendUtils from '../utils/BackendUtils';
import { localeString } from '../utils/LocaleUtils';
Expand Down Expand Up @@ -1231,33 +1232,33 @@ export default class SettingsStore {
// Retrieve the settings
const settings = await EncryptedStorage.getItem(STORAGE_KEY);
if (settings) {
this.settings = JSON.parse(settings);
if (!this.settings.fiatRatesSource) {
this.settings.fiatRatesSource = DEFAULT_FIAT_RATES_SOURCE;
const newSettings = JSON.parse(settings);
if (!newSettings.fiatRatesSource) {
newSettings.fiatRatesSource = DEFAULT_FIAT_RATES_SOURCE;
}

// migrate fiat settings from older versions
if (!this.settings.fiat || this.settings.fiat === 'Disabled') {
this.settings.fiat = DEFAULT_FIAT;
this.settings.fiatEnabled = false;
} else if (this.settings.fiatEnabled == null) {
this.settings.fiatEnabled = true;
if (!newSettings.fiat || newSettings.fiat === 'Disabled') {
newSettings.fiat = DEFAULT_FIAT;
newSettings.fiatEnabled = false;
} else if (newSettings.fiatEnabled == null) {
newSettings.fiatEnabled = true;
}

// set default LSPs if not defined
if (this.settings.enableLSP === undefined) {
this.settings.enableLSP = true;
if (newSettings.enableLSP === undefined) {
newSettings.enableLSP = true;
}
if (!this.settings.lspMainnet) {
this.settings.lspMainnet = DEFAULT_LSP_MAINNET;
if (!newSettings.lspMainnet) {
newSettings.lspMainnet = DEFAULT_LSP_MAINNET;
}
if (!this.settings.lspTestnet) {
this.settings.lspTestnet = DEFAULT_LSP_TESTNET;
if (!newSettings.lspTestnet) {
newSettings.lspTestnet = DEFAULT_LSP_TESTNET;
}

// default Lightning Address settings
if (!this.settings.lightningAddress) {
this.settings.lightningAddress = {
if (!newSettings.lightningAddress) {
newSettings.lightningAddress = {
enabled: false,
automaticallyAccept: true,
automaticallyAcceptAttestationLevel: 2,
Expand All @@ -1272,52 +1273,52 @@ export default class SettingsStore {

// migrate locale to ISO 639-1
if (
this.settings.locale != null &&
localeMigrationMapping[this.settings.locale]
newSettings.locale != null &&
localeMigrationMapping[newSettings.locale]
) {
this.settings.locale =
localeMigrationMapping[this.settings.locale];
newSettings.locale =
localeMigrationMapping[newSettings.locale];
}

// TODO PEGASUS
// temporarily toggle all beta users settings for now
const MOD_KEY = 'beta5-mod';
const mod = await EncryptedStorage.getItem(MOD_KEY);
if (!mod) {
this.settings.expressGraphSync = true;
if (this.settings.payments) {
this.settings.payments.defaultFeePercentage = '5.0';
this.settings.payments.defaultFeeFixed = '1000';
newSettings.expressGraphSync = true;
if (newSettings.payments) {
newSettings.payments.defaultFeePercentage = '5.0';
newSettings.payments.defaultFeeFixed = '1000';
} else {
this.settings.payments = {
newSettings.payments = {
defaultFeeMethod: 'fixed', // deprecated
defaultFeePercentage: '5.0',
defaultFeeFixed: '1000',
timeoutSeconds: '60',
preferredMempoolRate: 'fastestFee'
};
}
this.settings.automaticDisasterRecoveryBackup = true;
this.setSettings(JSON.stringify(this.settings));
newSettings.automaticDisasterRecoveryBackup = true;
this.setSettings(JSON.stringify(newSettings));
await EncryptedStorage.setItem(MOD_KEY, 'true');
}

const MOD_KEY2 = 'lsp-preview-mod';
const mod2 = await EncryptedStorage.getItem(MOD_KEY2);
if (!mod2) {
if (
this.settings?.lspMainnet ===
newSettings?.lspMainnet ===
'https://lsp-preview.lnolymp.us'
) {
this.settings.lspMainnet = DEFAULT_LSP_MAINNET;
newSettings.lspMainnet = DEFAULT_LSP_MAINNET;
}
if (
this.settings?.lspTestnet ===
newSettings?.lspTestnet ===
'https://testnet-lsp.lnolymp.us'
) {
this.settings.lspTestnet = DEFAULT_LSP_TESTNET;
newSettings.lspTestnet = DEFAULT_LSP_TESTNET;
}
this.setSettings(JSON.stringify(this.settings));
this.setSettings(JSON.stringify(newSettings));
await EncryptedStorage.setItem(MOD_KEY2, 'true');
}

Expand All @@ -1332,34 +1333,38 @@ export default class SettingsStore {
'noad.sathoarder.com'
];
if (
JSON.stringify(this.settings?.neutrinoPeersMainnet) ===
JSON.stringify(newSettings?.neutrinoPeersMainnet) ===
JSON.stringify(neutrinoPeersMainnetOld)
) {
this.settings.neutrinoPeersMainnet =
newSettings.neutrinoPeersMainnet =
DEFAULT_NEUTRINO_PEERS_MAINNET;
}
this.setSettings(JSON.stringify(this.settings));
this.setSettings(JSON.stringify(newSettings));
await EncryptedStorage.setItem(MOD_KEY3, 'true');
}

// migrate old POS squareEnabled setting to posEnabled
if (this.settings?.pos?.squareEnabled) {
this.settings.pos.posEnabled = PosEnabled.Square;
this.settings.pos.squareEnabled = false;
if (newSettings?.pos?.squareEnabled) {
newSettings.pos.posEnabled = PosEnabled.Square;
newSettings.pos.squareEnabled = false;
}

if (!this.settings.neutrinoPeersMainnet) {
this.settings.neutrinoPeersMainnet =
if (!newSettings.neutrinoPeersMainnet) {
newSettings.neutrinoPeersMainnet =
DEFAULT_NEUTRINO_PEERS_MAINNET;
}
if (!this.settings.neutrinoPeersTestnet) {
this.settings.neutrinoPeersTestnet =
if (!newSettings.neutrinoPeersTestnet) {
newSettings.neutrinoPeersTestnet =
DEFAULT_NEUTRINO_PEERS_TESTNET;
}

if (!isEqual(this.settings, newSettings)) {
this.settings = newSettings;
}

const node: any =
this.settings.nodes?.length &&
this.settings.nodes[this.settings.selectedNode || 0];
newSettings.nodes?.length &&
newSettings.nodes[newSettings.selectedNode || 0];
if (node) {
this.host = node.host;
this.port = node.port;
Expand Down
Loading
Loading