Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update Github CI packages #1499

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: make prepare-electron

- name: Upload web build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: electron-web-build
path: electron/web-build
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
run: yarn

- name: Download web build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: electron-web-build
path: electron/web-build
Expand All @@ -78,31 +78,31 @@ jobs:
run: make build-electron-${{ matrix.os }}-${{ matrix.arch }}

- name: Upload AppImage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'linux'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-AppImage
path: electron/dist/artifacts/local/*.AppImage
if-no-files-found: error

- name: Upload deb
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'linux'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-deb
path: electron/dist/artifacts/local/*.deb
if-no-files-found: error

- name: Upload dmg
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'macos'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-dmg
path: electron/dist/artifacts/local/*.dmg
if-no-files-found: error

- name: Upload exe
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: matrix.os == 'windows'
with:
name: teritori-${{ github.sha }}-${{ matrix.os }}-${{ matrix.arch }}-exe
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
run: eas submit --platform=android --path=${{ env.AAB_FILE }} --profile=production

- name: Upload aab
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: teritori-${{ github.sha }}.aab
path: ${{ env.AAB_FILE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
run: eas submit --platform=ios --path=${{ env.IPA_FILE }} --profile=production

- name: Upload IPA
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: teritori-${{ github.sha }}.ipa
path: ${{ env.IPA_FILE }}
Expand Down
73 changes: 33 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@cosmjs/stargate": "0.32.2",
"@cosmjs/tendermint-rpc": "0.32.2",
"@cosmology/core": "2.0.1",
"@dotlottie/react-player": "^1.6.5",
"@draft-js-plugins/anchor": "^4.2.0",
"@draft-js-plugins/buttons": "^4.3.3",
"@draft-js-plugins/editor": "^4.1.3",
Expand All @@ -45,7 +44,7 @@
"@ethersproject/bytes": "^5.7.0",
"@ethersproject/providers": "^5.7.2",
"@expo-google-fonts/exo": "^0.2.2",
"@expo/metro-runtime": "~3.1.3",
"@expo/metro-runtime": "~4.0.1",
"@faker-js/faker": "^8.4.1",
"@gnolang/gno-js-client": "^1.3.0",
"@gnolang/tm2-js-client": "^1.2.1",
Expand All @@ -55,17 +54,16 @@
"@improbable-eng/grpc-web-react-native-transport": "^0.15.0",
"@inline-svg-unique-id/react": "^1.2.3",
"@keplr-wallet/types": "^0.12.63",
"@lottiefiles/react-lottie-player": "^3.5.3",
"@metamask/detect-provider": "^2.0.0",
"@nandorojo/anchor": "^0.3.1",
"@osmonauts/lcd": "^1.0.3",
"@pinata/sdk": "^2.1.0",
"@react-native-anywhere/polyfill-base64": "^0.0.1-alpha.0",
"@react-native-async-storage/async-storage": "1.21.0",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-native-clipboard/clipboard": "^1.13.2",
"@react-native-community/slider": "4.4.2",
"@react-native-masked-view/masked-view": "0.3.0",
"@react-native-picker/picker": "2.6.1",
"@react-native-community/slider": "4.5.5",
"@react-native-masked-view/masked-view": "0.3.2",
"@react-native-picker/picker": "2.9.0",
"@react-navigation/bottom-tabs": "^6.5.11",
"@react-navigation/drawer": "^6.6.6",
"@react-navigation/native": "^6.0.11",
Expand Down Expand Up @@ -96,20 +94,20 @@
"electron-store": "^8.1.0",
"eslint-config-universe": "^12.0.0",
"ethers": "^5.7.2",
"expo": "~50.0.20",
"expo-av": "~13.10.6",
"expo-blur": "~12.9.2",
"expo-clipboard": "~5.0.1",
"expo-document-picker": "~11.10.1",
"expo-file-system": "~16.0.9",
"expo-font": "~11.10.3",
"expo-image-picker": "^14.7.1",
"expo-linear-gradient": "~12.7.2",
"expo": "latest",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do you need this? I think only syncing explo-blur should be okay
I any case we shouldn't change the expo version without doing the proper update walkthrough

Copy link
Collaborator Author

@WaDadidou WaDadidou Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a mistake
(I converted the PR to draft ^^)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I strongly suggest to revert all the js change and start fresh, you shouldn't need to update any typescript code

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes T_T

"expo-av": "~15.0.2",
"expo-blur": "~14.0.3",
"expo-clipboard": "~7.0.1",
"expo-document-picker": "~13.0.2",
"expo-file-system": "~18.0.9",
"expo-font": "~13.0.3",
"expo-image-picker": "~16.0.5",
"expo-linear-gradient": "~14.0.2",
"expo-optimize": "^0.2.20",
"expo-secure-store": "~12.8.1",
"expo-sharing": "~11.10.0",
"expo-splash-screen": "~0.26.5",
"expo-status-bar": "~1.11.1",
"expo-secure-store": "~14.0.1",
"expo-sharing": "~13.0.1",
"expo-splash-screen": "~0.29.21",
"expo-status-bar": "~2.0.1",
"glob": "^10.3.10",
"google-protobuf": "^3.21.2",
"graphql-request": "^5",
Expand All @@ -121,7 +119,7 @@
"listr2": "^8.0.1",
"lodash": "^4.17.21",
"long": "^5.2.1",
"lottie-react-native": "6.5.1",
"lottie-react-native": "7.1.0",
"markdown-it": "^14.1.0",
"markdown-it-emoji": "^3.0.0",
"markdown-it-footnote": "^4.0.0",
Expand All @@ -134,20 +132,20 @@
"plausible-tracker": "^0.3.8",
"pluralize": "^8.0.0",
"protobufjs": "^7.2.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-hook-form": "^7.50.1",
"react-leaflet": "^4.2.1",
"react-leaflet-cluster": "^2.1.0",
"react-leaflet-heatmap-layer-v3": "^3.0.3-beta-1",
"react-native": "0.73.6",
"react-native": "0.76.6",
"react-native-click-outside": "^0.1.1",
"react-native-confetti-cannon": "^1.5.2",
"react-native-countdown-component": "^2.7.1",
"react-native-drax": "^0.10.2",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.14.0",
"react-native-get-random-values": "~1.8.0",
"react-native-gesture-handler": "~2.20.2",
"react-native-get-random-values": "~1.11.0",
"react-native-heroicons": "^3.2.0",
"react-native-hoverable": "^0.2.0",
"react-native-image-picker": "^7.1.0",
Expand All @@ -158,20 +156,20 @@
"react-native-pie-chart": "^3.0.1",
"react-native-popup-menu": "^0.16.1",
"react-native-qrcode-svg": "^6.2.0",
"react-native-reanimated": "^3.6.2",
"react-native-reanimated": "~3.16.1",
"react-native-reanimated-carousel": "4.0.0-alpha.9",
"react-native-reanimated-table": "^0.0.2",
"react-native-render-html": "^6.3.4",
"react-native-safe-area-context": "4.8.2",
"react-native-screens": "~3.29.0",
"react-native-safe-area-context": "4.12.0",
"react-native-screens": "~4.4.0",
"react-native-smooth-slider": "^1.3.6",
"react-native-svg": "14.1.0",
"react-native-svg": "15.8.0",
"react-native-text-ticker": "^1.14.0",
"react-native-url-polyfill": "^2.0.0",
"react-native-vector-icons": "^10.0.2",
"react-native-vision-camera": "^3.9.0",
"react-native-web": "~0.19.6",
"react-native-webview": "13.6.4",
"react-native-web": "~0.19.13",
"react-native-webview": "13.12.5",
"react-redux": "^8.0.2",
"redux": "^4.2.1",
"redux-persist": "^6.0.0",
Expand All @@ -189,22 +187,17 @@
},
"devDependencies": {
"@axelar-network/axelarjs-types": "^0.33.0",
"@babel/core": "^7.23.3",
"@babel/core": "^7.25.2",
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-transform-arrow-functions": "^7.23.3",
"@babel/plugin-transform-shorthand-properties": "^7.23.3",
"@babel/plugin-transform-template-literals": "^7.23.3",
"@cosmwasm/ts-codegen": "^0.35.7",
"@faker-js/faker": "^8.4.1",
"@types/draft-convert": "^2.1.4",
"@types/draft-js": "^0.11.9",
"@types/html-to-draftjs": "^1.4.0",
"@types/markdown-it": "^14.1.2",
"@types/node": "^20.9.1",
"@types/react": "~18.2.45",
"@types/react": "~18.3.12",
"@types/react-native-countdown-component": "^2.7.0",
"@types/uuid": "^9.0.0",
"babel-loader": "^8.2.5",
Expand All @@ -217,7 +210,7 @@
"electron": "^27.1.2",
"eslint": "^8.52.0",
"eslint-plugin-react-hooks": "^4.6.0",
"expo-dev-client": "~3.3.12",
"expo-dev-client": "~5.0.11",
"expo-doctor": "^1.1.3",
"patch-package": "^7.0.2",
"postinstall-postinstall": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/boxes/LegacyPrimaryBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const LegacyPrimaryBox: React.FC<{
style?: StyleProp<ViewStyle>;
mainContainerStyle?: StyleProp<ViewStyle>;
noBrokenCorners?: boolean;
colors?: string[];
colors?: [string, string, ...string[]];
noRightBrokenBorder?: boolean;
children: ReactNode;
}> = ({
Expand Down Expand Up @@ -74,7 +74,7 @@ export const LegacyPrimaryBox: React.FC<{
disabled
? [neutral67, "#B7B7B7"]
: colors
? colors
? [colors[0], colors[0]]
: ["#01B7C5", "#782C96"]
}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/mediaPlayer/MediaPlayerVideo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ type ExpoAvVideoType = {
containerHeight: number;
isControlsShown: boolean;
videoMetadata: SocialFeedVideoMetadata;
borderRadius?: AnimatableNumericValue | number;
borderRadius?: AnimatableNumericValue | string;
postId?: string;
resizeMode?: ResizeMode;
id: string;
Expand Down
25 changes: 16 additions & 9 deletions packages/components/modals/GradientModalBase.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LinearGradient } from "expo-linear-gradient";
import { LinearGradient, LinearGradientProps } from "expo-linear-gradient";
import React, { ComponentType } from "react";
import {
Modal,
Expand Down Expand Up @@ -26,17 +26,26 @@ import { SeparatorGradient } from "../separators/SeparatorGradient";

import { fontRegular20 } from "@/utils/style/fonts";

const getModalColors = (status?: ModalBaseProps["modalStatus"]) => {
const getModalGradient = (status?: ModalBaseProps["modalStatus"]) => {
const gradientProps: LinearGradientProps = {
start: { x: 0, y: 0 },
end: { x: 0, y: 1 },
colors: [neutral00, neutral00],
};
switch (status) {
case "danger":
return [neutral00, errorColor];
gradientProps.colors = [neutral00, errorColor];
break;
case "success":
return [neutral00, successColor];
gradientProps.colors = [neutral00, successColor];
break;
case "dark":
return [neutral00, neutral33];
gradientProps.colors = [neutral00, neutral33];
break;
default:
return [neutral00];
gradientProps.colors = [neutral00, neutral00];
}
return gradientProps;
};
// TODO: Simplify this component (Useless childrenBottom ?. Better to let the parent totally decides which children to use ? Used in WalletManager.tsx, be careful !)

Expand Down Expand Up @@ -118,16 +127,14 @@ const GradientModalBase: React.FC<ModalBaseProps> = ({
]}
>
<LinearGradient
start={{ x: 0, y: 0 }}
end={{ x: 0, y: 1 }}
style={{
position: "absolute",
top: "40%",
left: 0,
bottom: 0,
right: 0,
}}
colors={getModalColors(modalStatus)}
{...getModalGradient(modalStatus)}
/>

{/*------ Modal header */}
Expand Down
6 changes: 3 additions & 3 deletions packages/screens/Mini/components/GradientBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ type GradientBoxProps = {
size?: number;
radius?: number;
direction?: GradientDirectionEnum;
colors: string[];
colors?: [string, string, ...string[]];
style?: StyleProp<ViewStyle>;
};

export default function GradientBox({
size,
radius,
direction = GradientDirectionEnum.topBottom,
colors = [],
colors,
style,
}: GradientBoxProps) {
const startEnd = gradientPositionGenerator(direction);
Expand All @@ -42,7 +42,7 @@ export default function GradientBox({
<LinearGradient
start={startEnd.start}
end={startEnd.end}
colors={colors.length ? colors : [primaryColor, secondaryColor]}
colors={colors?.length ? colors : [primaryColor, secondaryColor]}
style={{ flex: 1, borderRadius: radius ?? 6 }}
/>
</View>
Expand Down
3 changes: 2 additions & 1 deletion packages/utils/feed/map.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { LinearGradientProps } from "expo-linear-gradient";
import { LatLngBoundsLiteral } from "leaflet";
import { FunctionComponent } from "react";

Expand Down Expand Up @@ -257,7 +258,7 @@ export const getMapPostTextGradientType = (postCategory: PostCategory) => {
};

export const getMapPostTextGradient = (postCategory: PostCategory) => {
const gradientProps = {
const gradientProps: LinearGradientProps = {
colors: ["#FFFFFF", "#AAAAAA"],
start: { x: 0, y: 1 },
end: { x: 0, y: 0 },
Expand Down
14 changes: 13 additions & 1 deletion packages/utils/style/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
import { TextStyle } from "react-native";

export const exoFontFamilyFromFontWeight = (weight: string | undefined) => {
export const exoFontFamilyFromFontWeight = (
weight: string | number | undefined,
) => {
switch (weight) {
case "400":
case 400:
case "regular":
return "Exo_400Regular";
case "500":
case 500:
case "medium":
return "Exo_500Medium";
case "700":
case 700:
case "bold":
return "Exo_700Bold";
case "600":
case 600:
case "semibold":
return "Exo_600SemiBold";
default:
return "Exo_400Regular";
Expand Down
Loading
Loading