Skip to content

Commit

Permalink
Merge branch 'master' into 176175845-remove-operations-log
Browse files Browse the repository at this point in the history
  • Loading branch information
Undermaken authored Dec 22, 2020
2 parents 1e4ea88 + ab43340 commit 35ec6dc
Show file tree
Hide file tree
Showing 29 changed files with 424 additions and 275 deletions.
Binary file modified android/app/src/main/assets/fonts/io-icon-font.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion android/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
{
"path": "assets/fonts/io-icon-font/io-icon-font.ttf",
"sha1": "44ed8c5d6ab4137d0811c8801a6beaaec569c16c"
"sha1": "b64727d2e06f9f164d9591d6bb33a72f2818dd12"
},
{
"path": "assets/fonts/Ionicons/Ionicons.ttf",
Expand Down
Binary file modified assets/fonts/io-icon-font/io-icon-font.ttf
Binary file not shown.
8 changes: 4 additions & 4 deletions ios/ItaliaApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
F0625E7F2326825600EDEF90 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; };
F09FEB3C231818E3007071DB /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F09FEB0D231818E3007071DB /* Localizable.strings */; };
FEA80827C89F6ED5C4C7DF76 /* libPods-ItaliaApp-ItaliaAppTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B4A03CDB7A4D7F945386FFCB /* libPods-ItaliaApp-ItaliaAppTests.a */; };
143BC9D5A444411C84A09753 /* io-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E49C6E175408490CAE723D12 /* io-icon-font.ttf */; };
387A48BDFD9B4CC68EC0CA7D /* io-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C70242F329A447C3A846B49D /* io-icon-font.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -110,7 +110,7 @@
F09FEB0E231818E3007071DB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ItaliaApp/en.lproj/Localizable.strings; sourceTree = "<group>"; };
F09FEB3D231818F0007071DB /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ItaliaApp/it.lproj/Localizable.strings; sourceTree = "<group>"; };
F709D4AE20E44EFAAB255A8E /* TitilliumWeb-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Italic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Italic.ttf"; sourceTree = "<group>"; };
E49C6E175408490CAE723D12 /* io-icon-font.ttf */ = {isa = PBXFileReference; name = "io-icon-font.ttf"; path = "../assets/fonts/io-icon-font/io-icon-font.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
C70242F329A447C3A846B49D /* io-icon-font.ttf */ = {isa = PBXFileReference; name = "io-icon-font.ttf"; path = "../assets/fonts/io-icon-font/io-icon-font.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -199,7 +199,7 @@
640E574519CA4183B230AF22 /* RobotoMono-LightItalic.ttf */,
76E4CEA78E3F4060ABB59808 /* RobotoMono-Regular.ttf */,
5389C36762A04AE69D762289 /* RobotoMono-RegularItalic.ttf */,
E49C6E175408490CAE723D12 /* io-icon-font.ttf */,
C70242F329A447C3A846B49D /* io-icon-font.ttf */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -392,7 +392,7 @@
C2CF038002D24FEEAB41B336 /* RobotoMono-LightItalic.ttf in Resources */,
16E38CBD19D4437A9C020B21 /* RobotoMono-Regular.ttf in Resources */,
28E4866232804051B865FC10 /* RobotoMono-RegularItalic.ttf in Resources */,
143BC9D5A444411C84A09753 /* io-icon-font.ttf in Resources */,
387A48BDFD9B4CC68EC0CA7D /* io-icon-font.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
272 changes: 136 additions & 136 deletions ios/ItaliaApp/Info.plist
Original file line number Diff line number Diff line change
@@ -1,139 +1,139 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>IO</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>ioit</string>
<key>CFBundleURLSchemes</key>
<array>
<string>ioit</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>7</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>The app needs NSAppleMusicUsageDescription permission</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>The app needs NSBluetoothAlwaysUsageDescription permission</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>The app needs NSBluetoothPeripheralUsageDescription permission</string>
<key>NSCalendarsUsageDescription</key>
<string>IO needs access to the calendar to add event reminders</string>
<key>NSCameraUsageDescription</key>
<string>IO needs access to the camera to scan QR codes</string>
<key>NSContactsUsageDescription</key>
<string>IO needs access to your contacts to let you add them in calendar events</string>
<key>NSFaceIDUsageDescription</key>
<string>Enable Face ID for a faster identification.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>The app needs NSLocationAlwaysUsageDescription permission</string>
<key>NSLocationUsageDescription</key>
<string>The app needs NSLocationUsageDescription permission</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>The app needs NSLocationWhenInUseUsageDescription permission</string>
<key>NSMicrophoneUsageDescription</key>
<string>IO needs access to the microphone in case you want to leave a voice note</string>
<key>NSMotionUsageDescription</key>
<string>The app needs NSMotionUsageDescription permission</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>The app needs NSPhotoLibraryAddUsageDescription permission</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>IO needs access to the Photos to scan QR codes</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>The app needs NSSpeechRecognitionUsageDescription permission</string>
<key>UIAppFonts</key>
<array>
<string>TitilliumWeb-Black.ttf</string>
<string>TitilliumWeb-Bold.ttf</string>
<string>TitilliumWeb-BoldItalic.ttf</string>
<string>TitilliumWeb-ExtraLight.ttf</string>
<string>TitilliumWeb-ExtraLightItalic.ttf</string>
<string>TitilliumWeb-Italic.ttf</string>
<string>TitilliumWeb-Light.ttf</string>
<string>TitilliumWeb-LightItalic.ttf</string>
<string>TitilliumWeb-Regular.ttf</string>
<string>TitilliumWeb-SemiBold.ttf</string>
<string>TitilliumWeb-SemiBoldItalic.ttf</string>
<string>Ionicons.ttf</string>
<string>RobotoMono-Bold.ttf</string>
<string>RobotoMono-BoldItalic.ttf</string>
<string>RobotoMono-Light.ttf</string>
<string>RobotoMono-LightItalic.ttf</string>
<string>RobotoMono-Regular.ttf</string>
<string>RobotoMono-RegularItalic.ttf</string>
<string>io-icon-font.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
<array>
<string>com.apple.developer.nfc.readersession.iso7816.select-identifiers</string>
<string>A0000000308000000009816001</string>
<string>A00000000039</string>
<string>A0000002471001</string>
<string>00000000000000</string>
</array>
<key>method</key>
<string>app-store</string>
<key>NFCReaderUsageDescription</key>
<string>NFC tag to read NDEF messages into the application</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>http</string>
<string>https</string>
</array>
</dict>
</plist>
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>IO</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.15.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>ioit</string>
<key>CFBundleURLSchemes</key>
<array>
<string>ioit</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>7</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>The app needs NSAppleMusicUsageDescription permission</string>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>The app needs NSBluetoothAlwaysUsageDescription permission</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>The app needs NSBluetoothPeripheralUsageDescription permission</string>
<key>NSCalendarsUsageDescription</key>
<string>IO needs access to the calendar to add event reminders</string>
<key>NSCameraUsageDescription</key>
<string>IO needs access to the camera to scan QR codes</string>
<key>NSContactsUsageDescription</key>
<string>IO needs access to your contacts to let you add them in calendar events</string>
<key>NSFaceIDUsageDescription</key>
<string>Enable Face ID for a faster identification.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>The app needs NSLocationAlwaysUsageDescription permission</string>
<key>NSLocationUsageDescription</key>
<string>The app needs NSLocationUsageDescription permission</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>The app needs NSLocationWhenInUseUsageDescription permission</string>
<key>NSMicrophoneUsageDescription</key>
<string>IO needs access to the microphone in case you want to leave a voice note</string>
<key>NSMotionUsageDescription</key>
<string>The app needs NSMotionUsageDescription permission</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>The app needs NSPhotoLibraryAddUsageDescription permission</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>IO needs access to the Photos to scan QR codes</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>The app needs NSSpeechRecognitionUsageDescription permission</string>
<key>UIAppFonts</key>
<array>
<string>TitilliumWeb-Black.ttf</string>
<string>TitilliumWeb-Bold.ttf</string>
<string>TitilliumWeb-BoldItalic.ttf</string>
<string>TitilliumWeb-ExtraLight.ttf</string>
<string>TitilliumWeb-ExtraLightItalic.ttf</string>
<string>TitilliumWeb-Italic.ttf</string>
<string>TitilliumWeb-Light.ttf</string>
<string>TitilliumWeb-LightItalic.ttf</string>
<string>TitilliumWeb-Regular.ttf</string>
<string>TitilliumWeb-SemiBold.ttf</string>
<string>TitilliumWeb-SemiBoldItalic.ttf</string>
<string>Ionicons.ttf</string>
<string>RobotoMono-Bold.ttf</string>
<string>RobotoMono-BoldItalic.ttf</string>
<string>RobotoMono-Light.ttf</string>
<string>RobotoMono-LightItalic.ttf</string>
<string>RobotoMono-Regular.ttf</string>
<string>RobotoMono-RegularItalic.ttf</string>
<string>io-icon-font.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
<array>
<string>com.apple.developer.nfc.readersession.iso7816.select-identifiers</string>
<string>A0000000308000000009816001</string>
<string>A00000000039</string>
<string>A0000002471001</string>
<string>00000000000000</string>
</array>
<key>method</key>
<string>app-store</string>
<key>NFCReaderUsageDescription</key>
<string>NFC tag to read NDEF messages into the application</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>http</string>
<string>https</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
{
"path": "assets/fonts/io-icon-font/io-icon-font.ttf",
"sha1": "44ed8c5d6ab4137d0811c8801a6beaaec569c16c"
"sha1": "b64727d2e06f9f164d9591d6bb33a72f2818dd12"
},
{
"path": "assets/fonts/Ionicons/Ionicons.ttf",
Expand Down
4 changes: 2 additions & 2 deletions locales/en/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1937,9 +1937,9 @@ bonus:
summary:
bottomSheet:
title: "When will you find your transactions?"
body: "**Still not seeing your transaction?**\n\n- Check if your bank has already **recorded** the transaction: data are sent to IO app within 5 working days from the recording.\n\n- The transaction may have been handled with the POS of a company (acquirer) **not affiliated yet.** [Read more](https://io.italia.it/cashback/acquirer/)"
body: "**Still not seeing your transaction?**\n\n- Check if your bank has already **recorded** the transaction: data are sent to IO app within 5 working days from the recording.\n\n- Payments made using Google Pay, Apple Pay, and Samsung Pay are not supported yet. We are working with your bank to support these transactions as well.\n\n- The transaction may have been handled with the POS of a company (acquirer) **not affiliated yet.** [Read more](https://io.italia.it/cashback/acquirer/)"
calendarBlock:
text1: "Please note that before you'll see the transaction on IO, "
text1: "Please note that before you'll see the transaction on IO,"
text2: "it usually takes up 3 working days"
text3: "."
lastUpdated: "Latest valid transaction: "
Expand Down
4 changes: 2 additions & 2 deletions locales/it/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1968,9 +1968,9 @@ bonus:
summary:
bottomSheet:
title: Quando troverai le transazioni?
body: "**Continui a non vedere la transazione?**\n\n- Controlla se la tua banca ha già **contabilizzato** la transazione: i dati vengono trasmessi all'app entro 5 giorni lavorativi dalla contabilizzazione.\n\n- La transazione potrebbe essere stata gestita con il POS di un soggetto (acquirer) **non ancora convenzionato.** [Leggi di più](https://io.italia.it/cashback/acquirer/)"
body: "**Continui a non vedere la transazione?**\n\n- Controlla se la tua banca ha già **contabilizzato** la transazione: i dati vengono trasmessi all'app entro 5 giorni lavorativi dalla contabilizzazione.\n\n- I pagamenti effettuati con Google Pay, Apple Pay e Samsung Pay non sono ancora supportati. Stiamo lavorando con la tua banca per ricevere anche questo tipo di transazioni.\n\n- La transazione potrebbe essere stata gestita con il POS di un soggetto (acquirer) **non ancora convenzionato.** [Leggi di più](https://io.italia.it/cashback/acquirer/)"
calendarBlock:
text1: "Ti informiamo che prima che tu veda la transazione su IO, "
text1: "Ti informiamo che prima che tu veda la transazione su IO,"
text2: "possono passare in media 3 giorni lavorativi"
text3: "."
lastUpdated: "Ultima transazione valida: "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useActionOnFocus } from "../../../../../utils/hooks/useOnFocus";
import { navigateToBpdDetails } from "../../navigation/actions";
import { bpdDetailsLoadAll } from "../../store/actions/details";
import { bpdPeriodsAmountWalletVisibleSelector } from "../../store/reducers/details/combiner";
import { BpdPeriodWithAmount } from "../../store/reducers/details/periods";
import { BpdPeriodWithInfo } from "../../store/reducers/details/periods";
import { BpdCardComponent } from "../bpdCardComponent/BpdCardComponent";

type Props = ReturnType<typeof mapDispatchToProps> &
Expand Down Expand Up @@ -44,7 +44,7 @@ const BpdCardsInWalletContainer: React.FunctionComponent<Props> = props => {

const mapDispatchToProps = (dispatch: Dispatch) => ({
load: () => dispatch(bpdDetailsLoadAll()),
navigateToCashbackDetails: (period: BpdPeriodWithAmount) =>
navigateToCashbackDetails: (period: BpdPeriodWithInfo) =>
dispatch(navigateToBpdDetails(period))
});

Expand Down
4 changes: 2 additions & 2 deletions ts/features/bonus/bpd/navigation/actions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NavigationActions } from "react-navigation";
import { BpdPeriodWithAmount } from "../store/reducers/details/periods";
import { BpdPeriodWithInfo } from "../store/reducers/details/periods";
import BPD_ROUTES from "./routes";

export const navigateToBpdOnboardingLoadActivationStatus = () =>
Expand Down Expand Up @@ -45,7 +45,7 @@ export const navigateToBpdIbanInsertion = () =>

// Details

export const navigateToBpdDetails = (specificPeriod?: BpdPeriodWithAmount) =>
export const navigateToBpdDetails = (specificPeriod?: BpdPeriodWithInfo) =>
NavigationActions.navigate({
routeName: BPD_ROUTES.DETAILS,
params: { specificPeriod }
Expand Down
Loading

0 comments on commit 35ec6dc

Please sign in to comment.