Skip to content

Commit

Permalink
chore(dependancy): updated sdk version to expo-50 (#4174)
Browse files Browse the repository at this point in the history
* chore(ui-ux): updated bake logo

* updated snapshot

* chore(dependancy): updated sdk version to expo-50

* updated node version and jellyfish package version in docker compose

* updated packages

* fixed stroke width for convert icon

* fixed package version

* package version update and chore

* downgraded cypress

* updated cypress version

* added testIsolation as false

* fixed setting page testcases

* fixed transaction testcase

* fixed testcase for auction, auth and components

* fixed announcement poolpair, portfolio and receive screen e2e

* fixed dex e2e

* test case fix

* fixed e2e

* fixed poolpairs spec

* fixed loans e2e

* fixed tokendetails

* fixed failing e2e

* chore

* chore

* commented tokenDetails screen

* enabled experimentalMemoryManagement

* chore

* chore

* chore

* core

* updated workflows

* commented collateral specs

* fixed ci

* chore

* added on browser launch js flags

* fixed remove liquidity e2e

* fixed expo dependancy

* commented e2e for bottom sheet

* commented e2e testcase

* updated actions/checkout to v4.1.1

* updated node version

* commented collateral with invalid data testcase

* added CODECOV_TOKEN token in ci

* increased container number

* updated loans testcase

* updated loan and portfolio testcase

* minor fix

* commented failing testcase

* fixed swap instant testcase

* chore

* updated react navigation packages

* added custom back icon for dex screen

* added custom back icon

* minor fix

* added workaround for failing test case on expo-image
  • Loading branch information
fullstackninja864 authored Mar 28, 2024
1 parent 3639dc4 commit bfe7b2d
Show file tree
Hide file tree
Showing 101 changed files with 9,696 additions and 9,060 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-drift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
name: Tailwind
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: "npm"

- run: npm ci
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ jobs:
strategy:
fail-fast: false # https://github.com/cypress-io/github-action/issues/48
matrix:
containers: [1, 2, 3, 4, 5, 6, 7, 8]
containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Setup Playground
run: docker-compose -f docker-compose.yml up -d

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: "npm"

- run: npm ci
Expand All @@ -39,7 +39,7 @@ jobs:
- run: .github/workflows/ci/wait-for http://localhost:3002/_actuator/probes/liveness -t 240
- run: .github/workflows/ci/wait-for http://localhost:19550/ping -t 240

- uses: cypress-io/github-action@d79d2d530a66e641eb4a5f227e13bc985c60b964 # v4.2.2
- uses: cypress-io/github-action@1b70233146622b69e789ccdd4f9452adc638d25a # v6.6.1
with:
config-file: cypress.config.js
install: false
Expand All @@ -56,4 +56,6 @@ jobs:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
- uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: "npm"

- run: npm ci
Expand All @@ -28,11 +28,11 @@ jobs:
name: Lint - Prettier
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: npm

- run: npm ci
Expand All @@ -42,15 +42,15 @@ jobs:
# name: Unit Test
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
# - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
# - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
# - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
# with:
# node-version: 16
# node-version: 20
# cache: "npm"
#
# - run: npm ci
# - run: npm run test:ci
#
# - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
# - uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
# with:
# fail_ci_if_error: true
6 changes: 3 additions & 3 deletions .github/workflows/eas-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
environment: EAS Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
id: version
Expand All @@ -26,9 +26,9 @@ jobs:
result-encoding: string

- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20

- uses: expo/expo-github-action@4479f0b3692e25169fa71a02c30d6586ec2f5601 # tag=v7.2.0
with:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/eas-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
runs-on: ubuntu-latest
needs: [version]
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20

- uses: expo/expo-github-action@4479f0b3692e25169fa71a02c30d6586ec2f5601 # tag=v7.2.0
with:
Expand Down Expand Up @@ -79,10 +79,10 @@ jobs:
runs-on: ubuntu-latest
needs: [version]
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20

- uses: expo/expo-github-action@4479f0b3692e25169fa71a02c30d6586ec2f5601 # tag=v7.2.0
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/expo-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20

- run: npm ci

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/expo-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
name: Publish Preview
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: "npm"

- uses: expo/expo-github-action@4479f0b3692e25169fa71a02c30d6586ec2f5601 # tag=v7.2.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/expo-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
name: Publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20

- uses: expo/expo-github-action@4479f0b3692e25169fa71a02c30d6586ec2f5601 # tag=v7.2.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oss-governance-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
Labels:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # tag=v1.3.0
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/translations-reporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
name: Missing Report
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 16
node-version: 20
cache: "npm"
- run: npm ci
- name: Find missing translations
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.1
18.18.1
8 changes: 8 additions & 0 deletions __mocks__/expo-image.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import {
Image as RNImage,
ImageBackground as RNImageBackground,
} from 'react-native';

// TODO remove when https://github.com/expo/expo/issues/26087 is resolved
export const ImageBackground = RNImageBackground;
export const Image = RNImage;
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- "/var/run/docker.sock:/var/run/docker.sock:ro"

defi-blockchain:
image: defi/defichain:4.0.0
image: defi/defichain:4.0.8
ports:
- "19554:19554"
- "19551:19551"
Expand Down Expand Up @@ -64,7 +64,7 @@ services:
- RUST_LOG=debug

defi-playground:
image: ghcr.io/birthdayresearch/playground-api:4.0.1
image: ghcr.io/birthdayresearch/playground-api:4.0.7
depends_on:
- defi-blockchain
ports:
Expand All @@ -77,7 +77,7 @@ services:
- "traefik.http.routers.playground.entrypoints=web"

defi-whale:
image: ghcr.io/birthdayresearch/whale-api:4.0.1
image: ghcr.io/birthdayresearch/whale-api:4.0.7
depends_on:
- defi-blockchain
ports:
Expand Down
13 changes: 13 additions & 0 deletions jest.setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,16 @@ jest.mock("expo-linking", () => {

return module;
});

global.window.matchMedia = global.matchMedia || function (query) {
return {
matches: false,
media: query,
onchange: null,
addListener: jest.fn(), // deprecated
removeListener: jest.fn(), // deprecated
addEventListener: jest.fn(),
removeEventListener: jest.fn(),
dispatchEvent: jest.fn(),
};
}
10 changes: 6 additions & 4 deletions mobile-app/app/components/BottomSheetWithNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { CreateOrEditAddressLabelFormProps } from "@screens/AppNavigator/screens
import { getDefaultTheme } from "@constants/Theme";
import { ThemedViewV2 } from "@components/themed";
import { BottomSheetModal as BottomSheetModalWeb } from "./BottomSheetModal.web";
import { BackIcon } from "./icons/BackIcon";

interface BottomSheetWithNavProps {
modalRef: React.Ref<BottomSheetModalMethods>;
Expand Down Expand Up @@ -81,7 +82,7 @@ export const BottomSheetWithNav = React.memo(
<Navigator {...props} />
</BottomSheetModal>
);
}
},
);

function EmptyHandleComponent(): JSX.Element {
Expand All @@ -93,7 +94,7 @@ export const BottomSheetWebWithNav = React.memo(
props: BottomSheetWithNavProps & {
isModalDisplayed: boolean;
modalStyle?: { [other: string]: any };
}
},
): JSX.Element => {
return (
<BottomSheetModalWeb
Expand All @@ -106,7 +107,7 @@ export const BottomSheetWebWithNav = React.memo(
</View>
</BottomSheetModalWeb>
);
}
},
);

function Navigator(props: BottomSheetWithNavProps): JSX.Element {
Expand All @@ -118,14 +119,15 @@ function Navigator(props: BottomSheetWithNavProps): JSX.Element {
() => ({
...TransitionPresets.SlideFromRightIOS,
headerShown: true,
headerBackImage: BackIcon,
safeAreaInsets: { top: 0 },
cardStyle: {
backgroundColor: "white",
overflow: "visible",
},
headerMode: "screen",
}),
[]
[],
);

return (
Expand Down
10 changes: 6 additions & 4 deletions mobile-app/app/components/BottomSheetWithNavV2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { useThemeContext } from "@waveshq/walletkit-ui";
import { CreateOrEditAddressLabelFormProps } from "@screens/AppNavigator/screens/Portfolio/components/CreateOrEditAddressLabelForm";
import { getDefaultTheme } from "@constants/Theme";
import { BottomSheetModal as BottomSheetModalWeb } from "./BottomSheetModal.web";
import { BackIcon } from "./icons/BackIcon";

interface BottomSheetWithNavProps {
modalRef?: React.Ref<BottomSheetModalMethods>;
Expand Down Expand Up @@ -75,7 +76,7 @@ export const BottomSheetWithNavV2 = React.memo(
<Navigator {...props} />
</BottomSheetModal>
);
}
},
);

function EmptyHandleComponent(): JSX.Element {
Expand All @@ -87,7 +88,7 @@ export const BottomSheetWebWithNavV2 = React.memo(
props: BottomSheetWithNavProps & {
isModalDisplayed: boolean;
modalStyle?: { [other: string]: any };
}
},
): JSX.Element => {
return (
<BottomSheetModalWeb
Expand All @@ -100,7 +101,7 @@ export const BottomSheetWebWithNavV2 = React.memo(
</View>
</BottomSheetModalWeb>
);
}
},
);

function Navigator(props: BottomSheetWithNavProps): JSX.Element {
Expand All @@ -112,11 +113,12 @@ function Navigator(props: BottomSheetWithNavProps): JSX.Element {
() => ({
...TransitionPresets.SlideFromRightIOS,
headerShown: true,
headerBackImage: BackIcon,
safeAreaInsets: { top: 0 },
cardStyle: tailwind("bg-black bg-opacity-60"),
headerMode: "screen",
}),
[]
[],
);

return (
Expand Down
Loading

0 comments on commit bfe7b2d

Please sign in to comment.