Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into ollama-inline-completions

Browse source 
# Conflicts:
#	crates/zed/src/zed/edit_prediction_registry.rs
This commit is contained in:
Oliver Azevedo Barnes 2025-08-23 19:16:56 -04:00
commit 8bb757ab67
No known key found for this signature in database
223 changed files with 10889 additions and 6346 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/edit_prediction_button/src/edit_prediction_button.rs
View file

@ -248,13 +248,9 @@ impl Render for EditPredictionButton {
IconName::ZedPredictDisabled
};
if zeta::should_show_upsell_modal(&self.user_store, cx) {
if zeta::should_show_upsell_modal() {
let tooltip_meta = if self.user_store.read(cx).current_user().is_some() {
if self.user_store.read(cx).has_accepted_terms_of_service() {
"Choose a Plan"
} else {
"Accept the Terms of Service"
}
"Choose a Plan"
} else {
"Sign In"
};