Correcting merge conflict.
This commit is contained in:
		
							parent
							
								
									f9e8dfb079
								
							
						
					
					
						commit
						5659a8c086
					
				@ -34,31 +34,6 @@ export const mempoolFeeColors = [
 | 
			
		||||
export const feeLevels = [1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200,
 | 
			
		||||
  250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000];
 | 
			
		||||
 | 
			
		||||
interface Env {
 | 
			
		||||
  TESTNET_ENABLED: boolean;
 | 
			
		||||
  LIQUID_ENABLED: boolean;
 | 
			
		||||
  BISQ_ENABLED: boolean;
 | 
			
		||||
  BISQ_SEPARATE_BACKEND: boolean;
 | 
			
		||||
  SPONSORS_ENABLED: boolean;
 | 
			
		||||
  ELCTRS_ITEMS_PER_PAGE: number;
 | 
			
		||||
  KEEP_BLOCKS_AMOUNT: number;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const defaultEnv: Env = {
 | 
			
		||||
  'TESTNET_ENABLED': false,
 | 
			
		||||
  'LIQUID_ENABLED': false,
 | 
			
		||||
  'BISQ_ENABLED': false,
 | 
			
		||||
  'BISQ_SEPARATE_BACKEND': false,
 | 
			
		||||
  'SPONSORS_ENABLED': false,
 | 
			
		||||
  'ELCTRS_ITEMS_PER_PAGE': 25,
 | 
			
		||||
  'KEEP_BLOCKS_AMOUNT': 8
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const browserWindow = window || {};
 | 
			
		||||
// @ts-ignore
 | 
			
		||||
const browserWindowEnv = browserWindow.__env || {};
 | 
			
		||||
export const env: Env = Object.assign(defaultEnv, browserWindowEnv);
 | 
			
		||||
 | 
			
		||||
export interface Language {
 | 
			
		||||
  code: string;
 | 
			
		||||
  name: string;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user