fidel-react-native 1.4.1 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Fidel React Native bridge library change log
 
+## 1.6.0
+- Added the `defaultSelectedCountry` property which sets the country that will be selected by default, when opening the card enrollment screen.
+
+## 1.5.0
+- Remove card scanning confirmation screen.
+
+## 1.4.3
+- Add United Arab Emirates option as a country of issuance.
+- Country label shrinks its font size, to fit longer country names, on smaller devices.
+
+## 1.4.2
+- Update Fidel Android SDK version to allow French & Swedish translations be available in more countries.
+
 ## 1.4.1
 - Update Fidel & Android SDK versions.
 - Prepare for the newest React Native versions.

package/README.md

@@ -7,21 +7,17 @@ This SDK is a bridge between React Native and Fidel's native iOS and Android SDK
 
 ## Getting started
 
-`$ npm install fidel-react-native --save`
+`$ npm install fidel-react-native`
 
-## (Almost) Automatic linking (for RN >= 0.60)
+or
 
-`$ react-native link fidel-react-native`
+`$ yarn add fidel-react-native`
 
 ### iOS
 
-**1.** Go to the `ios` folder. Please check that in your `Podfile` you have the following line:
+**1.** Please make sure that the minimum platform is set to 9.1 in your Podfile: `platform :ios, '9.1'`.
 
-`pod 'fidel-react-native', :path => '../node_modules/fidel-react-native'`
-
-**2.** Please make sure that the minimum platform is set to 9.1 in your Podfile: `platform :ios, '9.1'`.
-
-**3.** Run `pod install`.
+**2.** Run `pod install`.
 
 ### Android
 
@@ -48,109 +44,6 @@ buildscript {
 }
 ```
 
-## Manual linking
-
-### iOS manual linking
-
-#### Step 1: Add the Fidel React Native iOS project as a dependency
-
-**1.** In XCode, in the project navigator, right click `Libraries` ➜ `Add Files to [your project's name]`
-
-**2.** Go to `node_modules` ➜ `fidel-react-native` and add `Fidel.xcodeproj`
-
-**3.** In XCode, in the project navigator, select your project. Add `libFidel.a` to your project's `Build Phases` ➜ `Link Binary With Libraries`
-
-**4.** Under your target's `Build Settings`, make sure to set `YES` for `Always Embed Swift Standard Libraries`. That's because, by default, your project might not need it. It needs to be `YES` because otherwise the project will not find the Swift libraries to be able to run our native iOS SDK.
-
-#### Step 2: Add the Native iOS SDK as a dependency
-
-You can use Cocoapods or install the library as a dynamic library.
-
-**5.** Add a `Podfile` in your `ios/` folder of your React Native project. It should include the following dependency:
-
-```ruby
-use_frameworks!
-pod 'Fidel'
-```
-
-Here is the simplest `Podfile` you need to link with our native iOS SDK:
-
-```ruby
-platform :ios, '9.1'
-
-workspace 'example'
-
-target 'example' do
-    use_frameworks!
-    pod 'Fidel'
-end
-```
-
-**6.** If you use an older Swift version, you should install a different `Fidel` pod version. If your project uses Swift `4.2.1`, for example, your Podfile should include `pod Fidel, '~>1.4'`, *not* `pod 'Fidel'` (which installs the latest version of the latest Swift supported version). Please check our [iOS SDK README (step 1)](https://github.com/FidelLimited/fidel-ios#step-1). You'll find a suitable version you should set for our Fidel iOS SDK.
-
-**7.** Run `pod install` in your terminal.
-
-**8.** Make sure to use the new `.xcworkspace` created by Cocoapods when you run your iOS app. React Native should use it by default.
-
-**9.** In order to allow scanning cards with the camera, make sure to add the key `NSCameraUsageDescription` to your iOS app `Info.plist` and set the value to a string describing why your app needs to use the camera (e.g. "To scan credit cards."). This string will be displayed when the app initially requests permission to access the camera.
-
-### Android manual linking
-
-**1.** Append the following lines to `android/settings.gradle`:
-
-```java
-include ':fidel-react-native'
-project(':fidel-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/fidel-react-native/android')
-```
-
-**2.** Insert the following lines inside the dependencies block in `android/app/build.gradle`:
-
-```java
-implementation project(':fidel-react-native')
-```
-
-**3.** Append Jitpack to `android/build.gradle`:
-
-```java
-allprojects {
-  repositories {
-    ...
-    maven { url "https://jitpack.io" }
-  }
-}
-```
-
-**4.** Make sure that the `minSdkVersion` is the same or higher than the `minSdkVersion` of our native Android SDK:
-
-```java
-buildscript {
-  ext {
-    ...
-    minSdkVersion = 19
-    ...
-  }
-}
-```
-
-**5.** Only for projects initialized with **RN <= 0.59**: Open up `android/app/src/main/java/[...]/MainApplication.java`
-
-- Add `import com.fidelreactlibrary.FidelPackage;` to the imports at the top of the file
-- Add `new FidelPackage()` to the list returned by the `getPackages()` method:
-
-```java
-protected List <ReactPackage> getPackages() {
-  return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-          new FidelPackage(),
-          //you might have other Packages here as well.
-      );
-}
-```
-
-**6.** Ensure that you have *Google Play Services* installed.
-
-For a physical device you need to search on Google for *Google Play Services*. There will be a link that takes you to the Play Store and from there you will see a button to update it (*do not* search within the Play Store).
-
 ## How to use Fidel's React Native SDK
 
 Import Fidel in your RN project:
@@ -188,6 +81,7 @@ const countries = [Fidel.Country.ireland, Fidel.Country.unitedStates];
 Fidel.setOptions({
   bannerImage: resolvedImage,
   allowedCountries: countries,
+  defaultSelectedCountry: Fidel.Country.unitedStates,
   supportedCardSchemes: Array.from(cardSchemes),
   autoScan: false,
   metaData: {'meta-data-1': 'value1'}, // additional data to pass with the card
@@ -288,7 +182,19 @@ Fidel.setOptions({
 });
 ```
 
-The possible options are: `.unitedKingdom`, `.unitedStates`, `.ireland`, `.sweden`, `.japan`, `.canada`. You can set one or multiple of these countries. If you don't set any allowed countries, the user will be able to choose any of the countries above. If you set only one country, the card linking screen will not show the country picker UI. Note that, when you set multiple countries, they will be displayed in the country picker UI in the order that you set them.
+The possible options are: `.canada`, `.ireland`, `.japan`, `.sweden`, `.unitedArabEmirates`, `.unitedKingdom`, `.unitedStates`. You can set one or multiple of these countries. If you don't set any allowed countries, the user will be able to choose any of the countries above. If you set only one country, the card linking screen will not show the country picker UI. Note that, when you set multiple countries, they will be displayed in the country picker UI in the order that you set them.
+
+### defaultSelectedCountry
+
+Use this parameter to set the country that will be selected by default when opening the card enrollment screen.
+
+```javascript
+Fidel.setOptions({
+  defaultSelectedCountry: Fidel.Country.unitedKingdom
+});
+```
+
+The possible options are: `.canada`, `.ireland`, `.japan`, `.sweden`, `.unitedArabEmirates`, `.unitedKingdom`, `.unitedStates`. The `defaultSelectedCountry` has to be part of the `allowedCountries` list. The default value of this option is `.unitedKingdom`.
 
 ### supportedCardSchemes
 
@@ -455,7 +361,7 @@ If you do not set a ```privacyUrl```, the text will become _in accordance with t
 
 ### Consent text for the rest of the world
 
-When you set United Kingdom, Ireland, Japan or Sweden as allowed countries or the user selects one of these countries from the list, a consent text specific for these countries will be applied.
+When you set Ireland, Japan , Sweden, United Arab Emirates or United Kingdom as allowed countries or the user selects one of these countries from the list, a consent text specific for these countries will be applied.
 
 The following would be an example Terms & Conditions text for ```Cashback Inc``` (an example company):
 

package/android/build.gradle

@@ -20,7 +20,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName "1.6.0"
     }
     lintOptions {
         abortOnError false
@@ -39,7 +39,7 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.github.FidelLimited:android-sdk:1.5.4'
+    implementation 'com.github.FidelLimited:android-sdk:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'androidx.test.ext:junit:1.1.2'

package/android/src/main/java/com/fidelreactlibrary/FidelModule.java

@@ -50,6 +50,16 @@ public class FidelModule extends ReactContextBaseJavaModule {
     return "NativeFidelBridge";
   }
 
+  @ReactMethod
+  public void addListener(String eventName) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
+  @ReactMethod
+  public void removeListeners(Integer count) {
+    // Keep: Required for RN built in Event Emitter Calls.
+  }
+
   @ReactMethod
   public void openForm(Callback callback) {
     final Activity activity = getCurrentActivity();

package/android/src/main/java/com/fidelreactlibrary/adapters/FidelCountryAdapter.java

@@ -15,6 +15,7 @@ public final class FidelCountryAdapter implements CountryAdapter {
 
     private static final String UNITED_KINGDOM_COUNTRY_KEY = "unitedKingdom";
     private static final String UNITED_STATES_COUNTRY_KEY = "unitedStates";
+    private static final String UNITED_ARAB_EMIRATES_KEY = "unitedArabEmirates";
     private static final String JAPAN_COUNTRY_KEY = "japan";
     private static final String SWEDEN_COUNTRY_KEY = "sweden";
     private static final String IRELAND_COUNTRY_KEY = "ireland";
@@ -26,6 +27,7 @@ public final class FidelCountryAdapter implements CountryAdapter {
         switch (country) {
             case UNITED_KINGDOM: return UNITED_KINGDOM_COUNTRY_KEY;
             case UNITED_STATES: return UNITED_STATES_COUNTRY_KEY;
+            case UNITED_ARAB_EMIRATES: return UNITED_ARAB_EMIRATES_KEY;
             case JAPAN: return JAPAN_COUNTRY_KEY;
             case SWEDEN: return SWEDEN_COUNTRY_KEY;
             case IRELAND: return IRELAND_COUNTRY_KEY;

package/android/src/main/java/com/fidelreactlibrary/adapters/FidelOptionsAdapter.java

@@ -30,6 +30,7 @@ public final class FidelOptionsAdapter implements DataProcessor<ReadableMap>, Da
     public static final String TERMS_CONDITIONS_URL_KEY = "termsConditionsUrl";
     public static final String META_DATA_KEY = "metaData";
     public static final String ALLOWED_COUNTRIES_KEY = "allowedCountries";
+    public static final String DEFAULT_SELECTED_COUNTRY_KEY = "defaultSelectedCountry";
     public static final String CARD_SCHEMES_KEY = "supportedCardSchemes";
     public static final List<String> OPTION_KEYS = Collections.unmodifiableList(
             Arrays.asList(
@@ -89,6 +90,9 @@ public final class FidelOptionsAdapter implements DataProcessor<ReadableMap>, Da
         if (valueIsValidFor(data, ALLOWED_COUNTRIES_KEY)) {
             Fidel.allowedCountries = countryAdapter.parseAllowedCountries(data.getArray(ALLOWED_COUNTRIES_KEY));
         }
+        if (valueIsValidFor(data, DEFAULT_SELECTED_COUNTRY_KEY)) {
+            Fidel.defaultSelectedCountry = countryAdapter.countryWithInteger(data.getInt(DEFAULT_SELECTED_COUNTRY_KEY));
+        }
         if (data.hasKey(CARD_SCHEMES_KEY)) {
             Fidel.supportedCardSchemes = cardSchemesAdapter.cardSchemesWithReadableArray(data.getArray(CARD_SCHEMES_KEY));
         }

package/android/src/test/java/com/fidelreactlibrary/FidelCountryAdapterTests.java

@@ -44,7 +44,6 @@ public class FidelCountryAdapterTests {
         }
     }
 
-
     @Test
     public void test_WhenAskedForKeyForCountry_ItProvidesIt() {
         for (Country country : Country.values()) {

package/ios/FLRNOptionsAdapter.m

@@ -18,7 +18,7 @@
 #import "FLRNCardSchemesAdapter.h"
 #import "RCTConvert+Options.h"
 
-#define FLCountryValues @{@"unitedKingdom" : @(FLCountryUnitedKingdom), @"ireland" : @(FLCountryIreland), @"unitedStates" : @(FLCountryUnitedStates), @"sweden" : @(FLCountrySweden), @"japan" : @(FLCountryJapan), @"canada" : @(FLCountryCanada)}
+#define FLCountryValues @{@"unitedArabEmirates" : @(FLCountryUnitedArabEmirates), @"unitedKingdom" : @(FLCountryUnitedKingdom), @"ireland" : @(FLCountryIreland), @"unitedStates" : @(FLCountryUnitedStates), @"sweden" : @(FLCountrySweden), @"japan" : @(FLCountryJapan), @"canada" : @(FLCountryCanada)}
 
 @interface FLRNOptionsAdapter()
 
@@ -62,6 +62,11 @@ NSString *const kOptionKey = @"Option";
         FLFidel.objc_allowedCountries = (NSArray<NSNumber *> *) rawData;
     }
     
+    if ([self valueIsValidFor:kDefaultSelectedCountryOptionKey fromDictionary:options]) {
+        id rawData = options[kDefaultSelectedCountryOptionKey];
+        FLFidel.defaultSelectedCountry = [((NSNumber *) rawData) integerValue];
+    }
+    
     if ([self valueIsValidFor:kAutoScanOptionKey fromDictionary:options]) {
         FLFidel.autoScan = [options[kAutoScanOptionKey] boolValue];
     }

package/ios/FLRNSDKOptions.h

@@ -10,14 +10,15 @@
 
 typedef NS_ENUM(NSUInteger, FLSDKOption) {
     FLSDKOptionBannerImage = 0,
-    FLSDKOptionCountry = 1,
-    FLSDKOptionAutoScan = 2,
-    FLSDKOptionMetaData = 3,
-    FLSDKOptionCompanyName = 4,
-    FLSDKOptionProgramName = 5,
-    FLSDKOptionDeleteInstructions = 6,
-    FLSDKOptionPrivacyURL = 7,
-    FLSDKOptionTermsConditionsURL = 8,
-    FLSDKOptionCardSchemes = 9,
+    FLSDKOptionAllowedCountries = 1,
+    FLSDKOptionDefaultSelectedCountry = 2,
+    FLSDKOptionAutoScan = 3,
+    FLSDKOptionMetaData = 4,
+    FLSDKOptionCompanyName = 5,
+    FLSDKOptionProgramName = 6,
+    FLSDKOptionDeleteInstructions = 7,
+    FLSDKOptionPrivacyURL = 8,
+    FLSDKOptionTermsConditionsURL = 9,
+    FLSDKOptionCardSchemes = 10,
     FLSDKOptionUnexistent = NSUIntegerMax
 };

package/ios/RCTConvert+Options.h

@@ -20,7 +20,8 @@
 #define FLSDKOptionValues\
 @{\
     kBannerImageOptionKey: @(FLSDKOptionBannerImage), \
-    kAllowedCountriesOptionKey: @(FLSDKOptionCountry), \
+    kAllowedCountriesOptionKey: @(FLSDKOptionAllowedCountries), \
+    kDefaultSelectedCountryOptionKey: @(FLSDKOptionDefaultSelectedCountry), \
     kAutoScanOptionKey: @(FLSDKOptionAutoScan),\
     kMetaDataOptionKey: @(FLSDKOptionMetaData), \
     kCompanyNameOptionKey: @(FLSDKOptionCompanyName), \
@@ -33,6 +34,7 @@
 
 FOUNDATION_EXPORT NSString *const kBannerImageOptionKey;
 FOUNDATION_EXPORT NSString *const kAllowedCountriesOptionKey;
+FOUNDATION_EXPORT NSString *const kDefaultSelectedCountryOptionKey;
 FOUNDATION_EXPORT NSString *const kAutoScanOptionKey;
 FOUNDATION_EXPORT NSString *const kMetaDataOptionKey;
 FOUNDATION_EXPORT NSString *const kCompanyNameOptionKey;

package/ios/RCTConvert+Options.m

@@ -10,6 +10,7 @@
 
 NSString *const kBannerImageOptionKey = @"bannerImage";
 NSString *const kAllowedCountriesOptionKey = @"allowedCountries";
+NSString *const kDefaultSelectedCountryOptionKey = @"defaultSelectedCountry";
 NSString *const kAutoScanOptionKey = @"autoScan";
 NSString *const kMetaDataOptionKey = @"metaData";
 NSString *const kCompanyNameOptionKey = @"companyName";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fidel-react-native",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "Fidel's React Native bridge library for iOS and Android.",
   "main": "index.js",
   "nativePackage": true,