Skip to content

Commit

Permalink
Merge branch 'master' into IOBP-1096-idpay-replace-legacy-markdown
Browse files Browse the repository at this point in the history
  • Loading branch information
Hantex9 authored Jan 14, 2025
2 parents 89dd98e + 5333333 commit 2bb556c
Show file tree
Hide file tree
Showing 22 changed files with 724 additions and 46 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

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.81.0-rc.0](https://github.com/pagopa/io-app/compare/2.80.0-rc.10...2.81.0-rc.0) (2025-01-14)


### Features

* **IT Wallet:** [[SIW-1944](https://pagopa.atlassian.net/browse/SIW-1944)] Remove the ongoing badge when errors occur ([#6592](https://github.com/pagopa/io-app/issues/6592)) ([ea2663f](https://github.com/pagopa/io-app/commit/ea2663f0628960da0a352aa0f4a721c63028a9cf))


### Bug Fixes

* [[IOBP-1100](https://pagopa.atlassian.net/browse/IOBP-1100)] German FAQ strings ([#6579](https://github.com/pagopa/io-app/issues/6579)) ([7e5ca4a](https://github.com/pagopa/io-app/commit/7e5ca4a918ec36b82e77837987da34db647bffdf))


### Chores

* [[IOAPPX-454](https://pagopa.atlassian.net/browse/IOAPPX-454)] Parametrize the use of `Kotlin` and `OkHttp` versions to be used from libraries if needed ([#6574](https://github.com/pagopa/io-app/issues/6574)) ([272db91](https://github.com/pagopa/io-app/commit/272db916e415a951675738427bccbe94c3eab2e7))
* [[IOPID-2575](https://pagopa.atlassian.net/browse/IOPID-2575)] Bump `rn-keychain` and force `AES_GCM_NO_AUTH` ([#6587](https://github.com/pagopa/io-app/issues/6587)) ([1059177](https://github.com/pagopa/io-app/commit/1059177fb10f9ffa9cf7994e113ccd845f4aef2a))
* **Cross:** [[IOAPPX-346](https://pagopa.atlassian.net/browse/IOAPPX-346)] Remove manually linked deps ([#5972](https://github.com/pagopa/io-app/issues/5972)) ([f2659cf](https://github.com/pagopa/io-app/commit/f2659cfd53feff5976397807916b84e234287d04))

## [2.80.0-rc.10](https://github.com/pagopa/io-app/compare/2.80.0-rc.9...2.80.0-rc.10) (2025-01-09)


Expand Down
8 changes: 4 additions & 4 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 100154905
versionName "2.80.0.10"
versionCode 100154906
versionName "2.81.0.0"
multiDexEnabled true
// The resConfigs attribute will remove all not required localized resources while building the application,
// including the localized resources from libraries.
Expand Down Expand Up @@ -189,8 +189,8 @@ dependencies {

implementation project(':react-native-cie')

implementation ("com.squareup.okhttp3:okhttp:4.9.2")
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.2'
implementation ("com.squareup.okhttp3:okhttp:${rootProject.ext.okhttpVersion}")
implementation ("com.squareup.okhttp3:logging-interceptor:${rootProject.ext.okhttpVersion}")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand Down
1 change: 1 addition & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ buildscript {
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.24"
firebaseMessagingVersion = "23.2.1"
okhttpVersion = "4.9.2"
}
repositories {
google()
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 = 10;
CURRENT_PROJECT_VERSION = 0;
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 = 10;
CURRENT_PROJECT_VERSION = 0;
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 = 10;
CURRENT_PROJECT_VERSION = 0;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = M2X5YQ4BJ7;
Expand Down
4 changes: 2 additions & 2 deletions ios/ItaliaApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.80.0</string>
<string>2.81.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>10</string>
<string>0</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/ItaliaAppTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>2.80.0</string>
<string>2.81.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>10</string>
<string>0</string>
</dict>
</plist>
25 changes: 22 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1866,8 +1866,27 @@ PODS:
- Yoga
- RNI18n (2.0.15):
- React
- RNKeychain (4.0.5):
- React
- RNKeychain (9.2.2):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNPermissions (4.0.0):
- React-Core
- RNQrGenerator (1.4.0):
Expand Down Expand Up @@ -2550,7 +2569,7 @@ SPEC CHECKSUMS:
RNFS: 4f02bbb5c95d71bade3d36a1b6514305ccefc4c9
RNGestureHandler: 27a63f2218affdf1a426d56682f9b174904838b3
RNI18n: 11ec5086508673ef71b5b567da3e8bcca8a926e1
RNKeychain: ffd0513e676445c637410b47249460cbf56bc9cb
RNKeychain: bd09fc5dcf4e0c4166a5d4012beaf2e093fcd9f5
RNPermissions: a4ae2524bd9cfb86f9c490b200b17f8dadb12e5a
RNQrGenerator: 60eab4f7c9e3f09db78029636fe356dca5cb585f
RNReactNativeHapticFeedback: 00ba111b82aa266bb3ee1aa576831c2ea9a9dfad
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "italia-app",
"version": "2.80.0-rc.10",
"version": "2.81.0-rc.0",
"private": true,
"scripts": {
"start": "react-native start",
Expand Down Expand Up @@ -64,7 +64,7 @@
"@pagopa/io-react-native-secure-storage": "^0.2.0",
"@pagopa/io-react-native-wallet": "^0.27.0",
"@pagopa/io-react-native-zendesk": "^0.3.29",
"@pagopa/react-native-cie": "^1.4.0",
"@pagopa/react-native-cie": "^1.4.2",
"@pagopa/ts-commons": "^10.15.0",
"@react-native-async-storage/async-storage": "^2.0.0",
"@react-native-clipboard/clipboard": "^1.14.0",
Expand Down Expand Up @@ -125,7 +125,7 @@
"react-native-i18n": "^2.0.15",
"react-native-image-pan-zoom": "^2.1.11",
"react-native-image-picker": "7.2.3",
"react-native-keychain": "^4.0.5",
"react-native-keychain": "^9.2.2",
"react-native-linear-gradient": "^2.5.6",
"react-native-markdown-display": "^7.0.2",
"react-native-masked-text": "^1.13.0",
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.80.0-rc.10
softwareVersion: 2.81.0-rc.0
developmentStatus: beta
softwareType: standalone/mobile
roadmap: "https://io.italia.it/"
Expand Down
12 changes: 9 additions & 3 deletions ts/__mocks__/react-native-keychain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ const keychainDB: KeychainDB = {};

// eslint-disable-next-line functional/immutable-data
module.exports = {
ACCESSIBLE: jest.fn(),
ACCESSIBLE: {
WHEN_UNLOCKED_THIS_DEVICE_ONLY: "WHEN_UNLOCKED_THIS_DEVICE_ONLY"
},

STORAGE_TYPE: {
AES_GCM_NO_AUTH: "AES_GCM_NO_AUTH"
},

getGenericPassword: jest.fn((options: Options) =>
keychainDB[options.service]
Expand All @@ -28,7 +34,7 @@ module.exports = {

setGenericPassword: jest.fn(
(username: string, password: string, options: Options) => {
// eslint-disable-next-line
// eslint-disable-next-line functional/immutable-data
keychainDB[options.service] = {
username,
password,
Expand All @@ -40,7 +46,7 @@ module.exports = {

resetGenericPassword: jest.fn((options: Options | undefined) => {
if (options) {
// eslint-disable-next-line
// eslint-disable-next-line functional/immutable-data
delete keychainDB[options.service];
}
return Promise.resolve(true);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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 { FimsHistoryHeaderComponent } from "../FimsHistoryHeaderComponent";
import { FIMS_ROUTES } from "../../../common/navigation";

describe("FimsHistoryHeaderComponent", () => {
it("should match snapshot", () => {
expect(renderComponent().toJSON()).toMatchSnapshot();
});
});

const renderComponent = () =>
renderScreenWithNavigationStoreContext<GlobalState>(
FimsHistoryHeaderComponent,
FIMS_ROUTES.HISTORY,
{},
createStore(appReducer, applicationChangeState("active") as any)
);
Loading

0 comments on commit 2bb556c

Please sign in to comment.