Skip to content

Commit

Permalink
- Fix Safari extension highlights for iOS 18
Browse files Browse the repository at this point in the history
- Do not suggest tags if not pro
- Turn off upgrade modal after login
  • Loading branch information
Rustem Mussabekov committed Sep 4, 2024
1 parent ce06342 commit 872d769
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "app",
"version": "5.6.53",
"version": "5.6.54",
"description": "All-in-one bookmark manager",
"author": "Rustem Mussabekov",
"license": "MIT",
Expand Down
10 changes: 8 additions & 2 deletions src/data/sagas/bookmarks/single.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
getMeta
} from '../../helpers/bookmarks'

import { isPro } from '../../selectors/user'

//Requests
export default function* () {
//helpers
Expand Down Expand Up @@ -369,10 +371,14 @@ function* reorder({ _id, ignore, order, collectionId }) {
}

function* suggestFields({ obj, ignore }) {
if (ignore) return;
if (!obj?.link && !obj?._id) return;
if (ignore) return
if (!obj?.link && !obj?._id) return

try{
const state = yield select()
const pro = isPro(state)
if (!pro) return

const { item } = obj._id ?
yield call(Api.get, `raindrop/${obj._id}/suggest`) :
yield call(Api.post, 'raindrop/suggest', obj)
Expand Down
4 changes: 2 additions & 2 deletions src/routes/my/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { Outlet } from 'react-router-dom'
import SplitView from '~co/screen/splitview'

import Sidebar from './sidebar'
import OnboardUpgrade from './onboard-upgrade'
// import OnboardUpgrade from './onboard-upgrade'

export default function PageMyLayout() {
return (
<SplitView>
<Sidebar />
<Outlet />
<OnboardUpgrade />
{/* <OnboardUpgrade /> */}
</SplitView>
)
}
4 changes: 2 additions & 2 deletions src/target/extension/background/highlights/logic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import browser from 'webextension-polyfill'
import { getMeta } from '~target'
import { getMeta, environment } from '~target'
import * as links from '../links'
import inject from './highlight.js?asis'
import Api from '~data/modules/api'
Expand All @@ -26,7 +26,7 @@ export async function load(tab) {
//activate
if (
highlights.length || //when any highlights
!browser.contextMenus || //always active for mobile
environment.includes('safari-ios') || //always active for safari-ios
await isInjected(tab) //or reset highlights if already injected
)
await apply(tab, highlights)
Expand Down

0 comments on commit 872d769

Please sign in to comment.