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

Polish for 0.8.0 release #433

Merged
merged 7 commits into from
Dec 12, 2023
Merged

Polish for 0.8.0 release #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2bbdbc0
Better wording: “Enable Holochain”
lucksus Dec 12, 2023
b4bea7e
Holochain disabled by default
lucksus Dec 12, 2023
111554d
Tooltip explaining Holochain test version
lucksus Dec 12, 2023
6286e9d
Popover instead of tooltip
lucksus Dec 12, 2023
7578154
Prevent 100% CPU with sleep in Future
lucksus Dec 12, 2023
3452067
Turn on Holochain by default again
lucksus Dec 12, 2023
c6de38c
Export AgentClient in core
lucksus Dec 12, 2023
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
3 changes: 2 additions & 1 deletion core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ export * from "./neighbourhood/NeighbourhoodProxy";
export * from "./typeDefs";
export * from "./DID";
export * from "./utils";
export * from './subject/SubjectEntity'
export * from './subject/SubjectEntity'
export * from "./agent/AgentClient";
2 changes: 2 additions & 0 deletions rust-executor/src/js_core/futures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::future::Future;
use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
use std::thread::sleep;
use tokio::sync::Mutex as TokioMutex;

pub struct EventLoopFuture {
Expand All @@ -21,6 +22,7 @@ impl Future for EventLoopFuture {
type Output = Result<(), AnyError>; // You can customize the output type.

fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
sleep(std::time::Duration::from_millis(1));
let worker = self.worker.try_lock();
if let Ok(mut worker) = worker {
let res = worker.poll_event_loop(cx, false);
Expand Down
28 changes: 19 additions & 9 deletions ui/src/components/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,15 +430,25 @@ const Login = (props: any) => {
>
Reset agent
</j-button>
<j-box px="100" >
<j-toggle
checked={holochain}
onChange={(e) => {
setHolochain(e.target.checked);
}}
>
{`Turn ${holochain ? 'off' : "on"} Holochain`}
</j-toggle>
<j-box px="100" >
<j-popover event="mouseover" placement="bottom">
<j-toggle slot="trigger"
checked={holochain}
onChange={(e) => {
setHolochain(e.target.checked);
}}
>
{`Enable Holochain`}
</j-toggle>
<j-box p="200" slot="content">
<j-text size="400" color="black" weight="600">
This ADAM release includes a new unstable Holochain release for testing.
</j-text>
<j-text size="400" color="black" weight="600">
Regular use of ADAM will work without Holochain using our centralized testing Languages.
</j-text>
</j-box>
</j-popover>
</j-box>
<j-button
full
Expand Down
Loading