chore: android victory native fix

denniske · Jul 16, 2024 · 504b3e3 · 504b3e3
1 parent eedaf58
commit 504b3e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/src/app/_layout.tsx b/app/src/app/_layout.tsx
@@ -230,7 +230,7 @@ function AppWrapper() {
     }, [config, account]);
 
     useEffect(() => {
-        if (account) {
+        if (Platform.OS === 'ios' && account) {
             const activity = new LiveActivity();
             activity.emitter.addListener<{ token: string }>('onTokenChanged', async ({ token }) => {
                 console.log('onActivityStarted', account.id, token);

diff --git a/app/src/app/statistics/winrates/[name].tsx b/app/src/app/statistics/winrates/[name].tsx
@@ -15,7 +15,7 @@ import { ProgressBar } from '@app/components/progress-bar';
 import { ScrollView } from '@app/components/scroll-view';
 import { Text } from '@app/components/text';
 import { getCivHistoryImage, getCivIconLocal } from '@app/helper/civs';
-import { VictoryChart, VictoryTheme, VictoryBar, VictoryAxis, VictoryArea, VictoryLine } from '@app/helper/victory';
+import { VictoryChart, VictoryTheme, VictoryBar, VictoryAxis, VictoryArea, VictoryLine, LineSegment } from '@app/helper/victory';
 import { useSelector } from '@app/redux/reducer';
 import tw from '@app/tailwind';
 import { Slider } from '@app/view/components/slider';
@@ -138,7 +138,7 @@ const StatsByRatingSlider: React.FC<{ width: number; grouping: WinrateGroupingRe
                                 <VictoryAxis dependentAxis crossAxis tickFormat={tickFormat} />
                                 <VictoryAxis
                                     crossAxis
-                                    gridComponent={<View />}
+                                    gridComponent={<LineSegment active={false} style={{ stroke: 'transparent' }} />}
                                     tickFormat={(x) => grouping.elo_groupings.find((eg) => eg.name === x)?.label.replace(/ *\([^)]*\) */g, '') ?? ''}
                                 />
 
@@ -190,7 +190,7 @@ const StatsByPatchSlider: React.FC<{ width: number; breakdown: WinrateBreakdown;
                                 theme={colorScheme === 'dark' ? VictoryTheme.customDark : VictoryTheme.custom}
                             >
                                 <VictoryAxis dependentAxis crossAxis tickFormat={tickFormat} />
-                                <VictoryAxis crossAxis gridComponent={<View />} tickFormat={(x) => format(new Date(x), 'M/d')} />
+                                <VictoryAxis crossAxis tickFormat={(x) => format(new Date(x), 'M/d')} />
 
                                 {domain[0] > domain[1] ? (
                                     <VictoryLine

diff --git a/app/src/helper/victory.ts b/app/src/helper/victory.ts
@@ -2,7 +2,7 @@ import tw from '@app/tailwind';
 import { cloneDeep, merge } from 'lodash';
 import { VictoryTheme } from 'victory-native';
 
-export { VictoryAxis, VictoryChart, VictoryLine, VictoryScatter, VictoryBar, VictoryArea } from 'victory-native';
+export { VictoryAxis, VictoryChart, VictoryLine, VictoryScatter, VictoryBar, VictoryArea, LineSegment } from 'victory-native';
 
 function replaceRobotoWithSystemFont(obj: any) {
     const keys = Object.keys(obj);

diff --git a/app/src/helper/victory.web.ts b/app/src/helper/victory.web.ts
@@ -2,7 +2,7 @@ import tw from '@app/tailwind';
 import { cloneDeep, merge } from 'lodash';
 import { VictoryTheme } from 'victory-native';
 
-export { VictoryAxis, VictoryChart, VictoryLine, VictoryScatter, VictoryBar, VictoryArea } from 'victory';
+export { VictoryAxis, VictoryChart, VictoryLine, VictoryScatter, VictoryBar, VictoryArea, LineSegment } from 'victory';
 
 function replaceRobotoWithSystemFont(obj: any) {
     const keys = Object.keys(obj);