Skip to content

Commit 2fa3415

Browse files
committed
replace icon images and fix race condition bug
1 parent 647b6a0 commit 2fa3415

15 files changed

+10
-168
lines changed

electron/build/icon.icns

171 KB
Binary file not shown.

electron/build/icon.ico

-168 KB
Binary file not shown.

electron/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const MAIN_FILE = path.join(__dirname, '../web/index.html')
3131
const SPLASH_FILE = path.join(__dirname, '../web/splashscreen.html')
3232
const LINUX_ICON_FILE = path.join(
3333
__dirname,
34-
'../web/logo/acorn-logo-desktop-512px.png'
34+
'../web/logo/acorn-app-icon-aug2022-512px.png'
3535
)
3636

3737
const DEVELOPMENT_UI_URL = process.env.ACORN_TEST_USER_2

web/dist/logo/acorn-app-avatar-green.svg

Lines changed: 0 additions & 38 deletions
This file was deleted.

web/dist/logo/acorn-app-avatar.svg

Lines changed: 0 additions & 36 deletions
This file was deleted.
Loading
74.7 KB
Loading
-51 KB
Binary file not shown.

web/dist/logo/[email protected]

-133 KB
Binary file not shown.

web/dist/logo/[email protected]

-189 KB
Binary file not shown.

web/dist/logo/acorn-logo-desktop.svg

Lines changed: 0 additions & 48 deletions
This file was deleted.

web/dist/logo/acorn-logo-green-desktop.svg

Lines changed: 0 additions & 36 deletions
This file was deleted.

web/src/routes/Dashboard/Dashboard.component.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ const Dashboard: React.FC<DashboardProps> = ({
7878
const [showImportModal, setShowImportModal] = useState(false)
7979

8080
// add new modal state managers here
81-
82-
useEffect(() => {
83-
// HACK, race conditions could occur here
84-
// but I want this to reset to null AFTER
85-
// 'resetProjectView' actions have been all called
86-
setTimeout(() => {
87-
setActiveProject(null)
88-
}, 1000)
89-
}, [])
9081

9182
// cells is an array of cellId strings
9283
useEffect(() => {

web/src/routes/ProjectView/MapView/MapView.connector.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ function mapStateToProps(state: RootState): MapViewProps {
1616
Object.values(state.projects.outcomes[projectId]).length === 0) ||
1717
// project is loading
1818
!state.projects.outcomes[projectId])
19+
20+
// console.log(projectId)
21+
// console.log(!!state.agentAddress)
22+
// console.log(
23+
// state.projects.outcomes[projectId] &&
24+
// Object.values(state.projects.outcomes[projectId]).length === 0
25+
// )
26+
// console.log(!state.projects.outcomes[projectId])
1927
return {
2028
projectId,
2129
translate: state.ui.viewport.translate,

web/src/routes/ProjectView/ProjectView.component.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ const ProjectViewInner: React.FC<ProjectViewInnerProps> = ({
138138
}, [goToOutcomeActionHash])
139139

140140
useEffect(() => {
141+
console.log('projectId In useEffect', projectId)
141142
// pushes this new projectId into the store/state
142143
setActiveProject(projectId)
143144
triggerRealtimeInfoSignal()

0 commit comments

Comments
 (0)