cleanup constants.tsx file

and fixup commit id showing at the bottom in settings
pull/2224/head
Audric Ackermann 3 years ago
parent 89757a95a6
commit 9d4989b66d
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -127,7 +127,7 @@ module.exports = grunt => {
}); });
function updateLocalConfig(update) { function updateLocalConfig(update) {
const environment = process.env.SIGNAL_ENV || 'development'; const environment = process.env.SIGNAL_ENV || 'production';
const configPath = `config/local-${environment}.json`; const configPath = `config/local-${environment}.json`;
let localConfig; let localConfig;
try { try {

@ -16,10 +16,10 @@
"scripts": { "scripts": {
"postinstall": "electron-builder install-app-deps && rimraf node_modules/dtrace-provider", "postinstall": "electron-builder install-app-deps && rimraf node_modules/dtrace-provider",
"start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .", "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
"grunt": "yarn clean-transpile && grunt", "grunt": "yarn clean-transpile && grunt",
"generate": "yarn grunt --force", "generate": "yarn grunt --force",
"build-release": "run-script-os", "build-release": "run-script-os",
"build-release-non-linux": "cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release", "build-release-non-linux": "yarn generate && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release",
"build-release:win32": "yarn build-release-non-linux", "build-release:win32": "yarn build-release-non-linux",
"build-release:macos": "yarn build-release-non-linux", "build-release:macos": "yarn build-release-non-linux",
"build-release:linux": "yarn sedtoDeb; yarn build-release-non-linux && yarn sedtoAppImage && yarn build-release-non-linux && yarn sedtoDeb", "build-release:linux": "yarn sedtoDeb; yarn build-release-non-linux && yarn sedtoAppImage && yarn build-release-non-linux && yarn sedtoDeb",
@ -33,9 +33,9 @@
"test": "mocha --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\" ", "test": "mocha --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\" ",
"lint-full": "yarn format-full && eslint . && tslint --format stylish --project .", "lint-full": "yarn format-full && eslint . && tslint --format stylish --project .",
"format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"",
"transpile": "tsc --incremental", "transpile": "tsc",
"transpile:watch": "yarn grunt --force; tsc -w", "transpile:watch": "yarn grunt --force; tsc -w",
"integration-test": "mocha --recursive --exit --timeout 30000 \"./ts/test-integration/**/*.test.js\" \"./ts/test/*.test.js\"", "integration-test": "npx playwright test",
"clean-transpile": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;", "clean-transpile": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;",
"ready": "yarn grunt && yarn lint-full && yarn test", "ready": "yarn grunt && yarn lint-full && yarn test",
"sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json", "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json",

@ -122,12 +122,12 @@ export class SessionRecording extends React.Component<Props, State> {
return ( return (
<div role="main" className="session-recording" tabIndex={0} onKeyDown={this.onKeyDown}> <div role="main" className="session-recording" tabIndex={0} onKeyDown={this.onKeyDown}>
<div className="session-recording--actions"> <div className="session-recording--actions">
<StyledFlexWrapper marginHorizontal={Constants.UI.SPACING.marginXs}> <StyledFlexWrapper marginHorizontal="5px">
{isRecording && ( {isRecording && (
<SessionIconButton <SessionIconButton
iconType="stop" iconType="stop"
iconSize="medium" iconSize="medium"
iconColor={Constants.UI.COLORS.DANGER_ALT} iconColor={'#FF4538'}
onClick={actionPauseFn} onClick={actionPauseFn}
/> />
)} )}

@ -50,28 +50,8 @@ export const VALIDATION = {
}; };
export const UI = { export const UI = {
// Pixels (scroll) from the top of the top of message container
// at which more messages should be loaded
MESSAGE_CONTAINER_BUFFER_OFFSET_PX: 1,
COLORS: { COLORS: {
// COMMON // COMMON
WHITE: '#FFFFFF',
WHITE_PALE: '#AFAFAF',
GREEN: '#00F782', GREEN: '#00F782',
// CAUTION
WARNING: '#FFC02E',
// SEMANTIC COLORS
DANGER: '#FF453A',
DANGER_ALT: '#FF4538',
},
SPACING: {
marginXs: '5px',
marginSm: '10px',
marginMd: '15px',
marginLg: '20px',
}, },
}; };

@ -130,7 +130,14 @@ export async function TEST_sendMessageToSnode(
const data64 = window.dcodeIO.ByteBuffer.wrap(data).toString('base64'); const data64 = window.dcodeIO.ByteBuffer.wrap(data).toString('base64');
const swarm = await getSwarmFor(pubKey); const swarm = await getSwarmFor(pubKey);
window?.log?.debug('Sending envelope with timestamp: ', timestamp, ' to ', ed25519Str(pubKey)); window?.log?.debug(
'Sending envelope with timestamp: ',
timestamp,
' to ',
ed25519Str(pubKey),
' size base64:',
data64.length
);
// send parameters // send parameters
const params = { const params = {
pubKey, pubKey,

Loading…
Cancel
Save