Skip to content

Commit

Permalink
Merge branch 'master' into PE-917-webview-component-missing-test
Browse files Browse the repository at this point in the history
  • Loading branch information
LeleDallas authored Jan 31, 2025
2 parents b8e4e9d + 665fc75 commit 4bbf2a5
Show file tree
Hide file tree
Showing 12 changed files with 993 additions and 23 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.82.0-rc.2](https://github.com/pagopa/io-app/compare/2.82.0-rc.1...2.82.0-rc.2) (2025-01-30)


### Bug Fixes

* [[IOBP-1169](https://pagopa.atlassian.net/browse/IOBP-1169)] Psp order logic ([#6658](https://github.com/pagopa/io-app/issues/6658)) ([bbc03d2](https://github.com/pagopa/io-app/commit/bbc03d27fa3eb8dd46f8623e0c5e04ee6cb1e27a))


### Chores

* changelog and versionCode alignment after hotfix ([1b3c456](https://github.com/pagopa/io-app/commit/1b3c45650d808f60da095913090972ff4963f3d1))

## [2.82.0-rc.1](https://github.com/pagopa/io-app/compare/2.82.0-rc.0...2.82.0-rc.1) (2025-01-29)


Expand Down Expand Up @@ -44,6 +56,15 @@ All notable changes to this project will be documented in this file. See [standa
* **IT Wallet:** [[SIW-1975](https://pagopa.atlassian.net/browse/SIW-1975)] Request app review after first viewing of driving license detail screen ([#6623](https://github.com/pagopa/io-app/issues/6623)) ([7132e67](https://github.com/pagopa/io-app/commit/7132e67c3e5672396004f262eb9b4dd25df43c26))
* **IT Wallet:** [[SIW-1996](https://pagopa.atlassian.net/browse/SIW-1996)] Bypass the screen capture block in dev mode ([#6639](https://github.com/pagopa/io-app/issues/6639)) ([e18b6d2](https://github.com/pagopa/io-app/commit/e18b6d21887fd9bbbd41c71982ef9170c06cb18f))

### [2.81.1-rc.1](https://github.com/pagopa/io-app/compare/2.81.1-rc.0...2.81.1-rc.1) (2025-01-30)

### [2.81.1-rc.0](https://github.com/pagopa/io-app/compare/2.81.0-rc.8...2.81.1-rc.0) (2025-01-30)


### Bug Fixes

* [[IOBP-1169](https://pagopa.atlassian.net/browse/IOBP-1169)] Psp order logic ([#6658](https://github.com/pagopa/io-app/issues/6658)) ([630621c](https://github.com/pagopa/io-app/commit/630621c8de48f8a73a19205d32b7f283134cd7da))

## [2.81.0-rc.8](https://github.com/pagopa/io-app/compare/2.81.0-rc.7...2.81.0-rc.8) (2025-01-23)


Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ android {
applicationId "it.pagopa.io.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 100154916
versionName "2.82.0.1"
versionCode 100154918
versionName "2.82.0.2"
multiDexEnabled true
// The resConfigs attribute will remove all not required localized resources while building the application,
// including the localized resources from libraries.
Expand Down
6 changes: 3 additions & 3 deletions ios/ItaliaApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@
CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -839,7 +839,7 @@
CODE_SIGN_ENTITLEMENTS = ItaliaApp/ItaliaApp.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = M2X5YQ4BJ7;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1081,7 +1081,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M2X5YQ4BJ7;
Expand Down
2 changes: 1 addition & 1 deletion ios/ItaliaApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<string>2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ItaliaAppTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>2</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "italia-app",
"version": "2.82.0-rc.1",
"version": "2.82.0-rc.2",
"private": true,
"scripts": {
"start": "react-native start",
Expand Down
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ releaseDate: "2024-11-21"
url: "https://github.com/pagopa/io-app"
applicationSuite: IO
landingURL: "https://io.italia.it/"
softwareVersion: 2.82.0-rc.1
softwareVersion: 2.82.0-rc.2
developmentStatus: beta
softwareType: standalone/mobile
roadmap: "https://io.italia.it/"
Expand Down
8 changes: 5 additions & 3 deletions ts/features/fims/history/components/FimsHistoryKoScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import { useNavigation } from "@react-navigation/native";
import { OperationResultScreenContent } from "../../../../components/screens/OperationResultScreenContent";
import I18n from "../../../../i18n";
import { useIODispatch } from "../../../../store/hooks";
import { fimsHistoryGet } from "../store/actions";
import { useIONavigation } from "../../../../navigation/params/AppParamsList";

export const FimsHistoryKoScreen = () => {
const navigation = useNavigation();
const navigation = useIONavigation();
const dispatch = useIODispatch();
return (
<OperationResultScreenContent
pictogram="umbrellaNew"
title={I18n.t("FIMS.history.errorStates.ko.title")}
subtitle={I18n.t("FIMS.history.errorStates.ko.body")}
secondaryAction={{
testID: "test-back",
label: I18n.t("global.buttons.back"),
onPress: () => navigation.goBack()
onPress: navigation.goBack
}}
action={{
label: I18n.t("global.buttons.retry"),
testID: "test-retry",
onPress: () =>
dispatch(fimsHistoryGet.request({ shouldReloadFromScratch: true }))
}}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import { fireEvent } from "@testing-library/react-native";
import { createStore } from "redux";
import { applicationChangeState } from "../../../../../store/actions/application";
import { appReducer } from "../../../../../store/reducers";
import { GlobalState } from "../../../../../store/reducers/types";
import { renderScreenWithNavigationStoreContext } from "../../../../../utils/testWrapper";
import { FIMS_ROUTES } from "../../../common/navigation";
import { FimsHistoryKoScreen } from "../FimsHistoryKoScreen";
import * as NAVIGATION from "../../../../../navigation/params/AppParamsList";
import * as DISPATCH from "../../../../../store/hooks";
import { fimsHistoryGet } from "../../store/actions";

describe("fimshistoryKoScreen", () => {
it("should match snapshot", () => {
const component = renderComponent();
expect(component.toJSON()).toMatchSnapshot();
});
it("should go back on back press", () => {
const mockBack = jest.fn();
jest.spyOn(NAVIGATION, "useIONavigation").mockImplementation(
() =>
({
goBack: mockBack
} as any)
);
const component = renderComponent();
expect(component).toBeDefined();

const button = component.getByTestId("test-back");
expect(button).toBeDefined();

fireEvent.press(button);
expect(mockBack).toHaveBeenCalledTimes(1);
});
it("should dispatch the correct retry action on retry press", () => {
const mockDispatch = jest.fn();
jest
.spyOn(DISPATCH, "useIODispatch")
.mockImplementation(() => mockDispatch);

const component = renderComponent();
expect(component).toBeDefined();

const button = component.getByTestId("test-retry");
expect(button).toBeDefined();

fireEvent.press(button);

expect(mockDispatch).toHaveBeenCalledTimes(1);
expect(mockDispatch).toHaveBeenCalledWith(
fimsHistoryGet.request({ shouldReloadFromScratch: true })
);
});
});
const renderComponent = () =>
renderScreenWithNavigationStoreContext<GlobalState>(
FimsHistoryKoScreen,
FIMS_ROUTES.HISTORY,
{},
createStore(appReducer, applicationChangeState("active") as any)
);
Loading

0 comments on commit 4bbf2a5

Please sign in to comment.