Merge branch 'hotfix/3.12.16'

Author: blackforestboi

external/@worldbrain/memex-common

@@ -1,6 +1,6 @@
 {
     "name": "worldbrain-extension",
-    "version": "3.12.15",
+    "version": "3.12.16",
     "homepage": "https://memex.garden",
     "repository": "https://github.com/WorldBrain/Memex",
     "scripts": {

package.json

@@ -133,7 +133,7 @@ export async function createAnnotation({
                         ? 'https://memex.social'
                         : 'http://staging.memex.social'
 
-                const link = baseUrl + '/a/' + shareData.remoteId
+                const link = baseUrl + '/a/' + shareData?.remoteId
                 navigator.clipboard.writeText(link)
             } else if (shareOpts?.shouldShare) {
                 shareData = await contentSharingBG.shareAnnotation({
@@ -150,7 +150,7 @@ export async function createAnnotation({
                     privacyLevelOverride ?? shareOptsToPrivacyLvl(shareOpts),
             })
 
-            if (shareData.remoteId != null) {
+            if (shareData?.remoteId != null) {
                 createAndCopyShareLink(
                     shareData.remoteId,
                     annotationUrl,

src/annotations/annotation-save-logic.ts

@@ -79,6 +79,7 @@ export interface Props extends RibbonSubcomponentProps {
     getRootElement: () => HTMLElement
     bgScriptBG: RemoteBGScriptInterface
     setWriteError: (error: string) => void
+    showRabbitHoleButton: boolean
 }
 
 interface State {
@@ -1683,6 +1684,7 @@ export default class Ribbon extends Component<Props, State> {
                 </IconContainer>
             )
         } else {
+            console.log('showRabbitHoleButton', this.props.showRabbitHoleButton)
             return (
                 <>
                     <InnerRibbon
@@ -1775,6 +1777,8 @@ export default class Ribbon extends Component<Props, State> {
                                                 this.renderAItriggerButton()}
                                             {!this.props.sidebar
                                                 .isSidebarOpen &&
+                                                this.props
+                                                    .showRabbitHoleButton &&
                                                 this.renderRabbitHoleTriggerButton()}
                                             {!this.props.sidebar
                                                 .isSidebarOpen &&

src/in-page-ui/ribbon/react/components/ribbon.tsx

@@ -133,6 +133,7 @@ export default class RibbonContainer extends StatefulUIElement<
                     })
                 }
                 isTrial={this.state.isTrial}
+                showRabbitHoleButton={this.state.showRabbitHoleButton}
                 signupDate={this.state.signupDate}
                 pageActivityIndicatorBG={this.props.pageActivityIndicatorBG}
                 contentSharingBG={this.props.contentSharing}

src/in-page-ui/ribbon/react/containers/ribbon/index.tsx

@@ -68,6 +68,7 @@ export interface RibbonContainerState {
     isTrial: boolean
     signupDate: number
     themeVariant: MemexThemeVariant
+    showRabbitHoleButton: boolean
 }
 
 export type RibbonContainerEvents = UIEvent<
@@ -184,6 +185,7 @@ export class RibbonContainerLogic extends UILogic<
             isTrial: false,
             signupDate: null,
             themeVariant: null,
+            showRabbitHoleButton: false,
         }
     }
 
@@ -225,6 +227,21 @@ export class RibbonContainerLogic extends UILogic<
         } catch (error) {
             console.error('error in updatePageCounter', error)
         }
+
+        const onboardingComplete = await browser.storage.local.get(
+            'rabbitHoleBetaFeatureAccessOnboardingDone',
+        )
+
+        console.log(
+            'onboardingcomlete',
+            onboardingComplete['rabbitHoleBetaFeatureAccessOnboardingDone'],
+        )
+
+        if (onboardingComplete['rabbitHoleBetaFeatureAccessOnboardingDone']) {
+            this.emitMutation({
+                showRabbitHoleButton: { $set: true },
+            })
+        }
     }
 
     async initThemeVariant() {

src/in-page-ui/ribbon/react/containers/ribbon/logic.ts

@@ -57,7 +57,7 @@ export class PageActivityIndicatorBackground {
     async setup(): Promise<void> {
         await this.deps.jobScheduler.scheduleJob({
             name: PERIODIC_SYNC_JOB_NAME,
-            periodInMinutes: 2,
+            periodInMinutes: 20,
             job: this.syncFollowedListEntriesWithNewActivity,
         })
     }