Skip to content

Commit

Permalink
Merge branch 'dev' into feat/hide-reference-scene-elements
Browse files Browse the repository at this point in the history
  • Loading branch information
begonaalvarezd authored Feb 4, 2024
2 parents 34fcfe7 + 40380c1 commit d417e85
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nova-build-temp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
TARGET_COMMIT:
description: "Target Commit Hash for the SDK"
required: false
default: "08318f6e3f92af609b89c571462ea31b32e7c121"
default: "7d32ae0bb7e93552618923fb272a5c1cc67c2c60"
environment:
type: choice
description: "Select the environment to deploy to"
Expand Down
7 changes: 3 additions & 4 deletions client/src/app/components/header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import "./Header.scss";

const NETWORK_DROPDOWN_LABEL = "Network Switcher";

const MODAL_MESSAGE: Record<ProtocolVersion, { title: string; description: string }> = {
const MODAL_MESSAGE: { [key in ProtocolVersion]?: { title: string; description: string } } = {
[LEGACY]: mainLegacyMessage,
[CHRYSALIS]: mainChrysalisMessage,
[STARDUST]: mainStardustMessage,
Expand All @@ -49,6 +49,7 @@ export default function Header({ rootPath, currentNetwork, networks, history, ac
const isNetworkSwitcherExpanded = expandedDropdownLabel === NETWORK_DROPDOWN_LABEL;
const isShimmerUi = isShimmerUiTheme(currentNetwork?.uiTheme);
const isMarketed = isMarketedNetwork(currentNetwork?.network);
const modalMessage = currentNetwork?.protocolVersion ? MODAL_MESSAGE[currentNetwork.protocolVersion] : undefined;

useEffect(() => {
saveThemeAndDispatchEvent(darkMode);
Expand Down Expand Up @@ -148,9 +149,7 @@ export default function Header({ rootPath, currentNetwork, networks, history, ac
protocolVersion={protocolVersion}
/>

{currentNetwork?.protocolVersion && (
<Modal icon="info" data={MODAL_MESSAGE[currentNetwork.protocolVersion]} showModal={setShow} />
)}
{modalMessage && <Modal icon="info" data={modalMessage} showModal={setShow} />}

{/* ----- Only visible in desktop ----- */}
{isMarketed && (
Expand Down
12 changes: 6 additions & 6 deletions client/src/features/visualizer-threejs/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const STEP_CAMERA_SHIFT_PX = 100;
export const MAX_BLOCK_INSTANCES = 5000;

// nodes
export const NODE_SIZE_DEFAULT = 5;
export const NODE_SIZE_DEFAULT = 10;
export const NODE_SIZE_INCREMENT = 3;

// zoom
Expand Down Expand Up @@ -78,8 +78,8 @@ export const EMITTER_DEPTH = 250;
export const MIN_TANGLE_RADIUS = 100;
export const MAX_TANGLE_RADIUS = 300;

export const MIN_BLOCKS_PER_SECOND = 50;
export const MAX_BLOCKS_PER_SECOND = 200;
export const MIN_BLOCKS_PER_SECOND = 100;
export const MAX_BLOCKS_PER_SECOND = 250;

export const MIN_BLOCK_NEAR_RADIUS = 20;

Expand All @@ -89,6 +89,6 @@ export const MAX_PREV_POINTS = 20;
export const EMITTER_X_POSITION_MULTIPLIER = 3;

export const MAX_SINUSOIDAL_AMPLITUDE = 200;
export const SINUSOIDAL_AMPLITUDE_ACCUMULATOR = 10;
export const INITIAL_SINUSOIDAL_AMPLITUDE = 40;
export const HALF_WAVE_PERIOD_SECONDS = 4;
export const SINUSOIDAL_AMPLITUDE_ACCUMULATOR = 30;
export const INITIAL_SINUSOIDAL_AMPLITUDE = 80;
export const HALF_WAVE_PERIOD_SECONDS = 5;
2 changes: 1 addition & 1 deletion setup_nova.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
SDK_DIR="iota-sdk"
TARGET_COMMIT="08318f6e3f92af609b89c571462ea31b32e7c121"
TARGET_COMMIT="7d32ae0bb7e93552618923fb272a5c1cc67c2c60"

if [ ! -d "$SDK_DIR" ]; then
git clone -b 2.0 [email protected]:iotaledger/iota-sdk.git
Expand Down

0 comments on commit d417e85

Please sign in to comment.