Skip to content

Commit 8dbb86f

Browse files
committed
close auth/account sheets on account change ;eliminate flutter cruft
1 parent f7ddbd8 commit 8dbb86f

File tree

6 files changed

+24
-316
lines changed

6 files changed

+24
-316
lines changed

.github/workflows/flutter_android.yml

-127
This file was deleted.

.github/workflows/flutter_ios.yml

-97
This file was deleted.

.github/workflows/flutter_macos.yml

-67
This file was deleted.

.github/workflows/flutter_windows.yml

-23
This file was deleted.

frontends/tamagui/packages/app/features/accounts/accounts_sheet.tsx

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Button, ColorTokens, Heading, Image, Input, Label, Paragraph, ScrollView, Sheet, SizeTokens, Switch, Theme, Tooltip, XStack, YStack, ZStack, useDebounceValue, useMedia } from '@jonline/ui';
22
import { AlertCircle, Cpu, Router, AlertTriangle, ArrowDownUp, AtSign, ChevronDown, ChevronLeft, ChevronRight, Info, Plus, SeparatorHorizontal, Server } from '@tamagui/lucide-icons';
33
import { DarkModeToggle } from 'app/components/dark_mode_toggle';
4-
import { useAppDispatch, useCurrentAccount, useFederatedAccountOrServer, useLocalConfiguration } from 'app/hooks';
4+
import { useAppDispatch, useCurrentAccount, useFederatedAccountOrServer, useLocalConfiguration, usePinnedAccountsAndServers } from 'app/hooks';
55
import { useMediaUrl } from 'app/hooks/use_media_url';
66
import { FederatedEntity, FederatedGroup, RootState, accountID, clearServerAlerts, selectAllAccounts, selectAllServers, serverID, setBrowsingServers, setHasOpenedAccounts, setSeparateAccountsByServer, setViewingRecommendedServers, upsertServer, useRootSelector, useServerTheme } from 'app/store';
77
import { themedButtonBackground } from 'app/utils';
@@ -55,6 +55,8 @@ export function AccountsSheet({ size = '$5', selectedGroup, primaryEntity }: Acc
5555
}
5656
}, [open]);
5757

58+
59+
5860
// useEffect(() => {
5961
// if (!openDebounced) {
6062
// setHasOpened(false);
@@ -155,6 +157,16 @@ export function AccountsSheet({ size = '$5', selectedGroup, primaryEntity }: Acc
155157
</Tooltip>, [currentServer, browsingOn]);
156158

157159
const renderContent = open || openDebounced;
160+
161+
const pinnedServers = usePinnedAccountsAndServers().map(aos =>
162+
`${aos.server ? serverID(aos.server) : null}-(${aos.account ? accountID(aos.account) : null})`);
163+
164+
useEffect(() => {
165+
if (open) {
166+
requestAnimationFrame(() => setOpen(false));
167+
}
168+
}, [pinnedServers]);
169+
158170
return <>
159171
<Button
160172
my='auto'

frontends/tamagui/packages/app/features/accounts/auth_sheet.tsx

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Button, Heading, Input, Sheet, standardAnimation, useMedia, XStack, YSt
22
import { ChevronLeft } from '@tamagui/lucide-icons';
33
import { TamaguiMarkdown } from 'app/components';
44
import { useAuthSheetContext } from 'app/contexts/auth_sheet_context';
5-
import { useAppDispatch, useCreationServer, useCurrentServer } from 'app/hooks';
5+
import { useAppDispatch, useCreationServer, useCurrentServer, usePinnedAccountsAndServers } from 'app/hooks';
66
import { accountID, actionSucceeded, clearAccountAlerts, createAccount, login, RootState, selectAllAccounts, serverID, store, useRootSelector, useServerTheme } from 'app/store';
77
import { themedButtonBackground } from 'app/utils';
88
import React, { useCallback, useEffect, useState } from 'react';
@@ -164,6 +164,16 @@ export function AuthSheet({ }: AuthSheetProps) {
164164
}, [open]);
165165

166166
const alreadyHasAccounts = accountsOnServer.length > 0;
167+
168+
169+
const pinnedServers = usePinnedAccountsAndServers().map(aos =>
170+
`${aos.server ? serverID(aos.server) : null}-(${aos.account ? accountID(aos.account) : null})`);
171+
172+
useEffect(() => {
173+
if (open) {
174+
requestAnimationFrame(() => setOpen(false));
175+
}
176+
}, [pinnedServers]);
167177
return (
168178
<>
169179
<Sheet

0 commit comments

Comments
 (0)