From 95c5b82e3d0403a6667bb9c071025399d0af57de Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Thu, 20 Jul 2023 18:51:44 -0300
Subject: [PATCH 01/39] Comprobe if the request was successfully

---
 src/api/api.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/api/api.js b/src/api/api.js
index 4fe2ec523..2b348eb80 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -519,11 +519,17 @@ class API {
     }
     const headers = {
       Authorization: `Bearer ${authToken}`,
-      requestOrigin
+      requestOrigin,
+      newVersion: 'true'
     };
     const { data } = await this.axiosInstance.get(`/subscriber/${userId}`, {
       headers
     });
+
+    if (data && !data.success) {
+      throw data;
+    }
+
     return data;
   }
 

From 9fcc82436cc42397d7bb184d17f416f6e38afafc Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Thu, 20 Jul 2023 18:54:48 -0300
Subject: [PATCH 02/39] Change err.error message

---
 src/components/Settings/Subscribe/Subscribe.container.js        | 2 +-
 .../SubscriptionProvider/SubscriptionProvider.actions.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index bceda3796..a626b6d9d 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -251,7 +251,7 @@ export class SubscribeContainer extends PureComponent {
           });
         }
       } catch (err) {
-        if (err.response?.data.error === 'subscriber not found') {
+        if (err.error === 'Subscriber was not found.') {
           // check if current subscriber already bought in this device
           if (localReceipts.length) {
             this.handleError({
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index f4c0e5c86..4a490264d 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -142,7 +142,7 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
       let ownedProduct = '';
-      if (err.response?.data.error === 'subscriber not found') {
+      if (err.error === 'Subscriber was not found.') {
         dispatch(
           updateSubscription({
             ownedProduct,

From e8af314bd373dd52b7b46143a56fe19103c3dfb4 Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Mon, 31 Jul 2023 18:21:25 -0300
Subject: [PATCH 03/39] Revert change on catch

---
 src/components/Settings/Subscribe/Subscribe.container.js      | 2 +-
 .../SubscriptionProvider/SubscriptionProvider.actions.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index a626b6d9d..b25249944 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -251,7 +251,7 @@ export class SubscribeContainer extends PureComponent {
           });
         }
       } catch (err) {
-        if (err.error === 'Subscriber was not found.') {
+        if (err.error === 'subscriber not found') {
           // check if current subscriber already bought in this device
           if (localReceipts.length) {
             this.handleError({
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 4a490264d..52d95dbf8 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -138,11 +138,11 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
         );
       }
     } catch (err) {
-      console.error(err.message);
+      console.error(err.message + '.', err.error);
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
       let ownedProduct = '';
-      if (err.error === 'Subscriber was not found.') {
+      if (err.error === 'subscriber not found') {
         dispatch(
           updateSubscription({
             ownedProduct,

From 41c572b75ee19a7d0cd6fbbf547e917b0b1ed9fa Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Mon, 31 Jul 2023 20:16:17 -0300
Subject: [PATCH 04/39] Support old getSub behaviour

---
 src/components/Settings/Subscribe/Subscribe.container.js     | 5 ++++-
 .../SubscriptionProvider/SubscriptionProvider.actions.js     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index b25249944..8b3705656 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -251,7 +251,10 @@ export class SubscribeContainer extends PureComponent {
           });
         }
       } catch (err) {
-        if (err.error === 'subscriber not found') {
+        const isSubscriberNotFound =
+          (err.response?.data?.error || err.error) === 'subscriber not found';
+
+        if (isSubscriberNotFound) {
           // check if current subscriber already bought in this device
           if (localReceipts.length) {
             this.handleError({
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 52d95dbf8..b4d9e2f68 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -142,7 +142,10 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
       let ownedProduct = '';
-      if (err.error === 'subscriber not found') {
+      const isSubscriberNotFound =
+        (err.response?.data?.error || err.error) === 'subscriber not found';
+
+      if (isSubscriberNotFound) {
         dispatch(
           updateSubscription({
             ownedProduct,

From fbdc3eaa82010837551d0b6a233c823862b3efdd Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Mon, 31 Jul 2023 20:17:10 -0300
Subject: [PATCH 05/39] Create error message

---
 .../SubscriptionProvider/SubscriptionProvider.actions.js  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index b4d9e2f68..2b0c8bca2 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -138,7 +138,13 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
         );
       }
     } catch (err) {
-      console.error(err.message + '.', err.error);
+      const errorMessage =
+        err.message +
+        '. ' +
+        (err.response ? err.response?.data?.message : err.error);
+
+      console.error(errorMessage);
+
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
       let ownedProduct = '';

From 4a9532a2f8aa2a70f2371ac8b3aceb86c9614f20 Mon Sep 17 00:00:00 2001
From: Rodri Sanchez <rodri.sanchez1998@gmail.com>
Date: Wed, 16 Aug 2023 14:53:33 -0300
Subject: [PATCH 06/39] Create function to getErrorMessage

---
 .../SubscriptionProvider.actions.js               | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 2b0c8bca2..4a5524848 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -138,12 +138,7 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
         );
       }
     } catch (err) {
-      const errorMessage =
-        err.message +
-        '. ' +
-        (err.response ? err.response?.data?.message : err.error);
-
-      console.error(errorMessage);
+      console.error(getErrorMessage(err));
 
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
@@ -206,6 +201,14 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
     }
     return isSubscribed;
   };
+
+  function getErrorMessage(err) {
+    return (
+      err.message +
+      '. ' +
+      (err.response ? err.response?.data?.message : err.error)
+    );
+  }
 }
 
 export function updatePlans() {

From 695c7bd963a2068464e87cf7b1fb519a828390a3 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Tue, 29 Aug 2023 13:14:18 -0300
Subject: [PATCH 07/39] WIP

---
 src/components/Settings/Settings.component.js |  2 +-
 .../Settings/Subscribe/Subscribe.container.js | 12 ++++----
 .../Settings/Subscribe/SubscriptionInfo.js    |  4 ++-
 src/cordova-util.js                           | 28 ++++++++++++++++++-
 .../SubscriptionProvider.actions.js           |  9 ++++--
 .../SubscriptionProvider.container.js         |  4 +--
 6 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/components/Settings/Settings.component.js b/src/components/Settings/Settings.component.js
index 616d16680..87826c9a4 100644
--- a/src/components/Settings/Settings.component.js
+++ b/src/components/Settings/Settings.component.js
@@ -97,7 +97,7 @@ export class Settings extends PureComponent {
       }
     ];
 
-    if (!isIOS() && !isElectron() && !isInFreeCountry) {
+    if (!isElectron() && !isInFreeCountry) {
       const subscribeSection = {
         icon: <MonetizationOnIcon />,
         text: messages.subscribe,
diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index cd9679703..60df94a3f 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -8,7 +8,7 @@ import { getUser, isLogged } from '../../App/App.selectors';
 import API from '../../../api';
 import messages from './Subscribe.messages';
 
-import { isAndroid } from '../../../cordova-util';
+import { isAndroid, isIOS } from '../../../cordova-util';
 import {
   updateSubscriberId,
   updateSubscription,
@@ -187,7 +187,7 @@ export class SubscribeContainer extends PureComponent {
 
       let localReceipts = '';
       let offers, offer;
-      if (isAndroid()) {
+      if (isAndroid() || isIOS()) {
         const storeProducts = await window.CdvPurchase.store.products;
         const prod = storeProducts.find(p => {
           return p.id === product.subscriptionId;
@@ -230,13 +230,13 @@ export class SubscribeContainer extends PureComponent {
         await API.updateSubscriber(apiProduct);
 
         // proceed with the purchase
-        if (isAndroid()) {
+        if (isAndroid() || isIOS()) {
           const order = await window.CdvPurchase.store.order(offer);
           if (order && order.isError) throw order;
           updateSubscription({
             ownedProduct: {
               ...product,
-              platform: 'android-playstore'
+              platform: isAndroid() ? 'android-playstore' : 'app-store'
             }
           });
         }
@@ -259,13 +259,13 @@ export class SubscribeContainer extends PureComponent {
             };
             const res = await API.createSubscriber(newSubscriber);
             updateSubscriberId(res._id);
-            if (isAndroid()) {
+            if (isAndroid() || isIOS()) {
               const order = await window.CdvPurchase.store.order(offer);
               if (order && order.isError) throw order;
               updateSubscription({
                 ownedProduct: {
                   ...product,
-                  platform: 'android-playstore'
+                  platform: isAndroid() ? 'android-playstore' : 'app-store'
                 }
               });
             }
diff --git a/src/components/Settings/Subscribe/SubscriptionInfo.js b/src/components/Settings/Subscribe/SubscriptionInfo.js
index 5370449b4..0b35db16e 100644
--- a/src/components/Settings/Subscribe/SubscriptionInfo.js
+++ b/src/components/Settings/Subscribe/SubscriptionInfo.js
@@ -29,7 +29,7 @@ import {
 
 import RefreshIcon from '@material-ui/icons/Refresh';
 import IconButton from '../../UI/IconButton';
-import { isAndroid } from '../../../cordova-util';
+import { isAndroid, isIOS } from '../../../cordova-util';
 
 const propTypes = {
   ownedProduct: PropTypes.object.isRequired,
@@ -137,6 +137,8 @@ const SubscriptionInfo = ({
           onClick={() => {
             if (isAndroid() && ownedProduct.platform === 'android-playstore')
               window.CdvPurchase.store.manageSubscriptions();
+            if (isIOS() && ownedProduct.platform === 'app-store')
+              window.CdvPurchase.store.manageSubscriptions();
             if (ownedProduct.platform === 'paypal') setCancelDialog(true);
             if (!isAndroid() && ownedProduct.platform === 'android-playstore')
               window.open(
diff --git a/src/cordova-util.js b/src/cordova-util.js
index f62c7a8c6..cbd26a165 100644
--- a/src/cordova-util.js
+++ b/src/cordova-util.js
@@ -46,7 +46,8 @@ export const initCordovaPlugins = () => {
       console.log(err.message);
     }
     try {
-      if (isAndroid) configAppPurchasePlugin();
+      if (isAndroid()) configAppPurchasePlugin();
+      if (isIOS()) IOSconfigureInAppPurchasePlugin();
     } catch (err) {
       console.log(err.message);
     }
@@ -78,6 +79,31 @@ const configAppPurchasePlugin = () => {
   store.initialize([Platform.GOOGLE_PLAY]);
 };
 
+const IOSconfigureInAppPurchasePlugin = () => {
+  const store = window.CdvPurchase.store;
+  const { ProductType, Platform } = window.CdvPurchase; // shortcuts
+  store.verbosity = 4;
+  store.register([
+    {
+      id: 'one_year_subscription',
+      type: ProductType.PAID_SUBSCRIPTION,
+      platform: Platform.APPLE_APPSTORE
+    },
+    {
+      id: 'test',
+      type: ProductType.PAID_SUBSCRIPTION,
+      platform: Platform.APPLE_APPSTORE
+    }
+  ]);
+  //error handler
+  store.error(errorHandler);
+  function errorHandler(error) {
+    console.error(`ERROR ${error.code}: ${error.message}`);
+  }
+
+  store.initialize([Platform.APPLE_APPSTORE]);
+};
+
 const configFacebookPlugin = () => {
   const FACEBOOK_APP_ID =
     process.env.REACT_APP_FACEBOOK_APP_ID || '340205533290626';
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 8b0468031..3eb3ce4c1 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -15,7 +15,7 @@ import {
 } from './SubscriptionProvider.constants';
 import API from '../../api';
 import { isLogged } from '../../components/App/App.selectors';
-import { isAndroid } from '../../cordova-util';
+import { isAndroid, isIOS } from '../../cordova-util';
 
 export function updateIsInFreeCountry() {
   return (dispatch, getState) => {
@@ -77,7 +77,10 @@ export function updateIsSubscribed(isOnResume = false) {
           })
         );
       } else {
-        if (isAndroid() && state.subscription.status === PROCCESING) {
+        if (
+          (isAndroid() || isIOS()) &&
+          state.subscription.status === PROCCESING
+        ) {
           //If just close the subscribe google play modal
           if (isOnResume) return;
 
@@ -209,7 +212,7 @@ export function updatePlans() {
           id: plan.planId,
           subscriptionId: plan.subscriptionId,
           billingPeriod: plan.period,
-          price: getPrice(plan.countries, locationCode),
+          price: getPrice(plan.countries, 'US'),
           title: plan.subscriptionName,
           tag: plan.tags[0],
           paypalId: plan.paypalId
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 6410d2335..903c8092c 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import API from '../../api';
-import { isAndroid } from '../../cordova-util';
+import { isAndroid, isIOS } from '../../cordova-util';
 
 import {
   updateIsInFreeCountry,
@@ -40,7 +40,7 @@ export class SubscriptionProvider extends Component {
     const isInFreeCountry = updateIsInFreeCountry();
     const isOnTrialPeriod = updateIsOnTrialPeriod();
     await updatePlans();
-    if (isAndroid()) this.configInAppPurchasePlugin();
+    if (isAndroid() || isIOS()) this.configInAppPurchasePlugin();
     onAndroidResume(async () => {
       const isOnResume = true;
       await updateIsSubscribed(isOnResume);

From 1728c0d2ff14649231f8f6d9f9ba420f535debc6 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Tue, 29 Aug 2023 13:29:41 -0300
Subject: [PATCH 08/39] wip

---
 src/components/Settings/Settings.component.js                   | 2 +-
 src/components/Settings/Subscribe/SubscriptionInfo.js           | 2 +-
 .../SubscriptionProvider/SubscriptionProvider.container.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Settings/Settings.component.js b/src/components/Settings/Settings.component.js
index 2a4473283..40ca29d6b 100644
--- a/src/components/Settings/Settings.component.js
+++ b/src/components/Settings/Settings.component.js
@@ -98,7 +98,7 @@ export class Settings extends PureComponent {
       }
     ];
 
-    if (!isIOS() && !isInFreeCountry) {
+    if (!isInFreeCountry) {
       const subscribeSection = {
         icon: <MonetizationOnIcon />,
         text: messages.subscribe,
diff --git a/src/components/Settings/Subscribe/SubscriptionInfo.js b/src/components/Settings/Subscribe/SubscriptionInfo.js
index 08c640c02..073b51a0a 100644
--- a/src/components/Settings/Subscribe/SubscriptionInfo.js
+++ b/src/components/Settings/Subscribe/SubscriptionInfo.js
@@ -29,7 +29,7 @@ import {
 
 import RefreshIcon from '@material-ui/icons/Refresh';
 import IconButton from '../../UI/IconButton';
-import { isAndroid, isElectron } from '../../../cordova-util';
+import { isAndroid, isElectron, isIOS } from '../../../cordova-util';
 import { GOOGLE_PLAY_STORE_URL } from './Subscribe.constants';
 
 const propTypes = {
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index ad3a7dfab..2294573dc 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -41,7 +41,7 @@ export class SubscriptionProvider extends Component {
     const isInFreeCountry = updateIsInFreeCountry();
     const isOnTrialPeriod = updateIsOnTrialPeriod();
     await updatePlans();
-    if (isAndroid()) this.configInAppPurchasePlugin();
+    if (isAndroid() || isIOS()) this.configInAppPurchasePlugin();
     if (!isInFreeCountry && !isOnTrialPeriod && !isSubscribed && isLogged) {
       showPremiumRequired({ showTryPeriodFinishedMessages: true });
     }

From 6514a1bd45a4de65c9987bfeb7d41cff8e9da5d9 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 15 Sep 2023 10:28:59 -0300
Subject: [PATCH 09/39] Find offer by product ID on IOS

---
 src/components/Settings/Subscribe/Subscribe.container.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index 22dce3064..82c9fcd48 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -207,7 +207,10 @@ export class SubscribeContainer extends PureComponent {
         try {
           await window.CdvPurchase.store.update();
           offers = prod.offers;
-          offer = offers.find(offer => offer.tags[0] === product.tag);
+          const findCallback = isAndroid()
+            ? offer => offer.tags[0] === product.tag
+            : offer => offer.productId === product.subscriptionId;
+          offer = offers.find(findCallback);
         } catch (err) {
           console.error('Cannot subscribe product. Error: ', err.message);
           this.handleError(err);

From e6f412101d7b54789d0aecdce329403f1d40dfda Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 15 Sep 2023 10:30:04 -0300
Subject: [PATCH 10/39] Create function to filter ios IAP transactions

---
 src/components/Settings/Subscribe/Subscribe.container.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index 82c9fcd48..6d9f0508f 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -218,6 +218,11 @@ export class SubscribeContainer extends PureComponent {
         }
       }
 
+      const filterInAppPurchaseIOSTransactions = uniqueReceipt =>
+        uniqueReceipt.transactions.filter(
+          transaction => transaction.transactionId !== 'appstore.application'
+        );
+
       try {
         // update the api
         const requestOrigin =

From 8be98e26072261ff39176f4f19f735a08b5ef293 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 15 Sep 2023 10:36:12 -0300
Subject: [PATCH 11/39] Check if apple account already bought a subscription
 for other user

---
 .../Settings/Subscribe/Subscribe.container.js | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index 6d9f0508f..07d021a21 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -233,18 +233,40 @@ export class SubscribeContainer extends PureComponent {
         // check if current subscriber already bought in this device
         if (localReceipts.length) {
           const lastReceipt = localReceipts.slice(-1)[0];
-          if (
-            lastReceipt &&
-            lastReceipt?.transactions[0]?.nativePurchase?.orderId !==
-              subscriber.transaction?.transactionId
-          ) {
-            this.handleError({
-              code: '0001',
-              message: intl.formatMessage(messages.googleAccountAlreadyOwns)
-            });
-            return;
+          if (isAndroid()) {
+            if (
+              lastReceipt &&
+              lastReceipt?.transactions[0]?.nativePurchase?.orderId !==
+                subscriber.transaction?.transactionId
+            ) {
+              this.handleError({
+                code: '0001',
+                message: intl.formatMessage(messages.googleAccountAlreadyOwns)
+              });
+              return;
+            }
+          }
+          if (isIOS()) {
+            //IOS have a unique receipt here => 'lastReceipt'
+            const inAppPurchaseTransactions = filterInAppPurchaseIOSTransactions(
+              lastReceipt
+            );
+
+            const lastTransaction = inAppPurchaseTransactions.slice(-1)[0];
+            if (
+              inAppPurchaseTransactions.length > 0 &&
+              lastTransaction?.transactionId !==
+                subscriber.transaction?.transactionId
+            ) {
+              this.handleError({
+                code: '0001',
+                message: intl.formatMessage(messages.appleAccountAlreadyOwns)
+              });
+              return;
+            }
           }
         }
+
         await API.updateSubscriber(apiProduct);
 
         // proceed with the purchase

From 17c3a1df65c3e9540af1a1ed29a9dd8594e27a68 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 10:40:26 -0300
Subject: [PATCH 12/39] For IOS show error if subscriber not found and
 transaction exist

---
 .../Settings/Subscribe/Subscribe.container.js | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index 07d021a21..be82394b4 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -283,12 +283,27 @@ export class SubscribeContainer extends PureComponent {
       } catch (err) {
         if (err.response?.data.error === 'subscriber not found') {
           // check if current subscriber already bought in this device
-          if (localReceipts.length) {
-            this.handleError({
-              code: '0001',
-              message: intl.formatMessage(messages.googleAccountAlreadyOwns)
-            });
-            return;
+          if (isAndroid()) {
+            if (localReceipts.length) {
+              this.handleError({
+                code: '0001',
+                message: intl.formatMessage(messages.googleAccountAlreadyOwns)
+              });
+              return;
+            }
+          }
+          if (isIOS()) {
+            const localInAppPurchaseTransactions = filterInAppPurchaseIOSTransactions(
+              localReceipts[0]
+            );
+
+            if (localInAppPurchaseTransactions.length) {
+              this.handleError({
+                code: '0001',
+                message: intl.formatMessage(messages.appleAccountAlreadyOwns)
+              });
+              return;
+            }
           }
           try {
             const newSubscriber = {

From 0680295b2381ed8004f2348cfc486c980f7c593a Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 10:41:03 -0300
Subject: [PATCH 13/39] Add error message for IOS

---
 src/components/Settings/Subscribe/Subscribe.messages.js | 5 +++++
 src/translations/src/cboard.json                        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/components/Settings/Subscribe/Subscribe.messages.js b/src/components/Settings/Subscribe/Subscribe.messages.js
index 37d4e4c6d..0f12e0851 100644
--- a/src/components/Settings/Subscribe/Subscribe.messages.js
+++ b/src/components/Settings/Subscribe/Subscribe.messages.js
@@ -148,6 +148,11 @@ export default defineMessages({
     defaultMessage:
       'It looks like your Google account has already purchased a product. Try restarting the app.'
   },
+  appleAccountAlreadyOwns: {
+    id: 'cboard.components.Settings.Subscribe.appleAccountAlreadyOwns',
+    defaultMessage:
+      'It looks like your Apple account has already purchased a product. Try restarting the app.'
+  },
   fallback: {
     id: 'cboard.components.Settings.Subscribe.fallback',
     defaultMessage: 'Wait please...'
diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json
index c7532a5ca..fb92d8fc6 100644
--- a/src/translations/src/cboard.json
+++ b/src/translations/src/cboard.json
@@ -498,6 +498,7 @@
   "cboard.components.Settings.Subscribe.premiumWillEnd": "The premium acces will end on:",
   "cboard.components.Settings.Subscribe.fixPaymentIssue": "Fix your payment issues before the:",
   "cboard.components.Settings.Subscribe.googleAccountAlreadyOwns": "It looks like your Google account has already purchased a product. Try restarting the app.",
+  "cboard.components.Settings.Subscribe.appleAccountAlreadyOwns": "It looks like your Apple account has already purchased a product. Try restarting the app.",
   "cboard.components.Settings.Subscribe.close": "Close",
   "cboard.components.Settings.Subscribe.cancelSubscriptionDescription": "Are you sure you want to cancel your current plan?",
   "cboard.components.Settings.Subscribe.canceledSubscriptionOk": "Your subscription was cancelled successfully.",

From 3ccfd5cd604cc3ca10da9516e3241a8be73b01a7 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 10:51:07 -0300
Subject: [PATCH 14/39] call manage subscriptions on Cancel click on IOS

---
 src/components/Settings/Subscribe/SubscriptionInfo.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/Subscribe/SubscriptionInfo.js b/src/components/Settings/Subscribe/SubscriptionInfo.js
index 073b51a0a..e2a92b8c5 100644
--- a/src/components/Settings/Subscribe/SubscriptionInfo.js
+++ b/src/components/Settings/Subscribe/SubscriptionInfo.js
@@ -131,14 +131,14 @@ const SubscriptionInfo = ({
       </div>
       <div className="Subscribe__Info__Button__Container">
         <Button
-          variant={isAndroid() ? 'contained' : 'text'}
+          variant={isAndroid() || isIOS() ? 'contained' : 'text'}
           fullWidth={false}
           color="primary"
           disabled={ownedProduct.platform === 'paypal' && status !== ACTIVE}
           onClick={() => {
             if (isAndroid() && ownedProduct.platform === 'android-playstore')
               window.CdvPurchase.store.manageSubscriptions();
-            if (isIOS() && ownedProduct.platform === 'app-store')
+            if (isIOS() && ownedProduct.platform === 'ios-appstore')
               window.CdvPurchase.store.manageSubscriptions();
             if (ownedProduct.platform === 'paypal') setCancelDialog(true);
             if (!isAndroid() && ownedProduct.platform === 'android-playstore') {

From 748cf2792f8a8bc628f1002a9f53f6e8d3e3ad48 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 10:53:56 -0300
Subject: [PATCH 15/39] Allow click subscribe button on IOS

---
 src/components/Settings/Subscribe/SubscriptionPlans.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/Subscribe/SubscriptionPlans.js b/src/components/Settings/Subscribe/SubscriptionPlans.js
index 835b15b15..be02ce65a 100644
--- a/src/components/Settings/Subscribe/SubscriptionPlans.js
+++ b/src/components/Settings/Subscribe/SubscriptionPlans.js
@@ -16,7 +16,7 @@ import {
   ON_TRIAL_PERIOD
 } from './Subscribe.constants';
 import { formatDuration, formatTitle } from './Subscribe.helpers';
-import { isAndroid, isCordova, isElectron } from '../../../cordova-util';
+import { isAndroid, isCordova, isElectron, isIOS } from '../../../cordova-util';
 import { CircularProgress } from '@material-ui/core';
 
 import { Link } from 'react-router-dom';
@@ -228,7 +228,7 @@ const SubscriptionPlans = ({
                       /{formatDuration(product.billingPeriod)}
                     </Typography>
                   </Box>
-                  {isAndroid() && (
+                  {(isAndroid() || isIOS()) && (
                     <Button
                       variant="contained"
                       fullWidth={true}

From 64f302e8299359c1d7f543ba3c44219682ef42a7 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 10:58:05 -0300
Subject: [PATCH 16/39] Restore purchase In IOS if local transactions exists

---
 .../SubscriptionProvider.actions.js            | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index b17dae9dd..57fb4314a 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -83,8 +83,22 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
           })
         );
       } else {
-        if (isAndroid() && state.subscription.status === PROCCESING) {
-          const localReceipts = window.CdvPurchase.store.localReceipts;
+        if (
+          (isAndroid() || isIOS()) &&
+          state.subscription.status === PROCCESING
+        ) {
+          const filterInAppPurchaseIOSTransactions = uniqueReceipt =>
+            uniqueReceipt.transactions.filter(
+              transaction =>
+                transaction.transactionId !== 'appstore.application'
+            );
+
+          const localReceipts = isIOS()
+            ? filterInAppPurchaseIOSTransactions(
+                window.CdvPurchase.store.localReceipts[0]
+              )
+            : window.CdvPurchase.store.localReceipts;
+
           if (localReceipts.length) {
             //Restore purchases to pass to approved
             window.CdvPurchase.store.restorePurchases();

From 4c651dbb5a566b2891443f6871ac3e2fbbb186bc Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 11:01:09 -0300
Subject: [PATCH 17/39] on purchase validator for IOS use single transaction

---
 .../SubscriptionProvider/SubscriptionProvider.container.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 2294573dc..193f67801 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -69,7 +69,10 @@ export class SubscriptionProvider extends Component {
   configPurchaseValidator = () => {
     window.CdvPurchase.store.validator = async function(receipt, callback) {
       try {
-        const transaction = receipt.transactions[0];
+        const transaction = isIOS()
+          ? receipt.transaction
+          : receipt.transactions[0];
+
         const res = await API.postTransaction(transaction);
         if (!res.ok) throw res;
         callback({

From fde5373337556b7a0f3bde03d918b5324ee5ec2b Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 17 Sep 2023 11:02:56 -0300
Subject: [PATCH 18/39] Finish receipt after verify it and return that is
 expired/not subscribed

---
 .../SubscriptionProvider.container.js           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 193f67801..3d8a78c4d 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -16,7 +16,9 @@ import {
 import {
   ACTIVE,
   CANCELED,
-  IN_GRACE_PERIOD
+  IN_GRACE_PERIOD,
+  EXPIRED,
+  NOT_SUBSCRIBED
 } from './SubscriptionProvider.constants';
 import { isLogged } from '../../components/App/App.selectors';
 
@@ -127,6 +129,19 @@ export class SubscriptionProvider extends Component {
           });
           receipt.finish();
           window.CdvPurchase.store.finish(receipt);
+          return;
+        }
+        if ([EXPIRED, NOT_SUBSCRIBED]) {
+          const { isInFreeCountry, isOnTrialPeriod } = this.props;
+          updateSubscription({
+            status: state,
+            isInFreeCountry: isInFreeCountry,
+            isOnTrialPeriod: isOnTrialPeriod,
+            isSubscribed: false,
+            expiryDate: null
+          });
+          receipt.finish();
+          window.CdvPurchase.store.finish(receipt);
         }
       })
       .finished(receipt => {});

From 720aad2581e873d2ebceddfc911e2759e2143562 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Mon, 18 Sep 2023 21:07:32 -0300
Subject: [PATCH 19/39] Manage Error during verifying receipt (for IOS)

For Ios only. should be implemented on Android
---
 .../Settings/Subscribe/SubscriptionPlans.js    |  5 ++++-
 .../SubscriptionProvider.actions.js            | 18 +++++++++++++++++-
 .../SubscriptionProvider.constants.js          |  1 +
 .../SubscriptionProvider.container.js          | 15 ++++++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/components/Settings/Subscribe/SubscriptionPlans.js b/src/components/Settings/Subscribe/SubscriptionPlans.js
index be02ce65a..dc7d69a4f 100644
--- a/src/components/Settings/Subscribe/SubscriptionPlans.js
+++ b/src/components/Settings/Subscribe/SubscriptionPlans.js
@@ -26,7 +26,8 @@ import {
   EXPIRED,
   NOT_SUBSCRIBED,
   PROCCESING,
-  ON_HOLD
+  ON_HOLD,
+  UNVERIFIED
 } from '../../../providers/SubscriptionProvider/SubscriptionProvider.constants';
 import Button from '@material-ui/core/Button';
 import List from '@material-ui/core/List';
@@ -95,6 +96,7 @@ const SubscriptionPlans = ({
 
   const subscriptionStatus = (function() {
     if (error.showError) return ERROR;
+    if (status === UNVERIFIED) return UNVERIFIED;
     if (isOnTrialPeriod && !isSubscribed && status !== PROCCESING)
       return ON_TRIAL_PERIOD;
     if (products.length || status !== NOT_SUBSCRIBED)
@@ -111,6 +113,7 @@ const SubscriptionPlans = ({
     error: 'error',
     empty_product: 'warning',
     on_trial_period: 'info',
+    unverified: 'warning',
 
     on_hold: 'warning', //TODO
     paused: 'info', //TODO
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 57fb4314a..db3dc7061 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -11,7 +11,8 @@ import {
   CANCELLED,
   IN_GRACE_PERIOD,
   EXPIRED,
-  PROCCESING
+  PROCCESING,
+  UNVERIFIED
 } from './SubscriptionProvider.constants';
 import API from '../../api';
 import { isLogged } from '../../components/App/App.selectors';
@@ -114,6 +115,21 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
           return;
         }
 
+        if (isIOS()) {
+          const iosLocalReceipt = window.CdvPurchase.store.localReceipts[0];
+          if (state.subscription.status === UNVERIFIED && iosLocalReceipt) {
+            dispatch(
+              updateSubscription({
+                ownedProduct: state.subscription.ownedProduct,
+                status: PROCCESING,
+                isSubscribed,
+                expiryDate
+              })
+            );
+            return window.CdvPurchase.store.verify(iosLocalReceipt);
+          }
+        }
+
         const userId = state.app.userData.id;
         const { status, product, transaction } = await API.getSubscriber(
           userId,
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.constants.js b/src/providers/SubscriptionProvider/SubscriptionProvider.constants.js
index b1cb6d185..1b18afffb 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.constants.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.constants.js
@@ -16,6 +16,7 @@ export const IN_GRACE_PERIOD = 'in_grace_period';
 export const PAUSED = 'paused';
 export const EXPIRED = 'expired';
 export const ON_HOLD = 'on_hold';
+export const UNVERIFIED = 'unverified';
 
 export const REQUIRING_PREMIUM_COUNTRIES = [
   'AT',
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 3d8a78c4d..03117eba5 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -18,7 +18,8 @@ import {
   CANCELED,
   IN_GRACE_PERIOD,
   EXPIRED,
-  NOT_SUBSCRIBED
+  NOT_SUBSCRIBED,
+  UNVERIFIED
 } from './SubscriptionProvider.constants';
 import { isLogged } from '../../components/App/App.selectors';
 
@@ -117,6 +118,18 @@ export class SubscriptionProvider extends Component {
       .approved(receipt => {
         if (isLogged) window.CdvPurchase.store.verify(receipt);
       })
+      .unverified(response => {
+        if (isIOS()) {
+          const { isInFreeCountry, isOnTrialPeriod } = this.props;
+          updateSubscription({
+            status: UNVERIFIED,
+            isInFreeCountry: isInFreeCountry,
+            isOnTrialPeriod: isOnTrialPeriod,
+            isSubscribed: false,
+            expiryDate: null
+          });
+        }
+      })
       .verified(async receipt => {
         const state = receipt.collection[0]?.subscriptionState;
         if ([ACTIVE, CANCELED, IN_GRACE_PERIOD].includes(state)) {

From e1a6112dc9af20cbbbb372a8f56f5cae84963398 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 22 Sep 2023 16:37:52 -0300
Subject: [PATCH 20/39] Add translated message to the unverified state

---
 src/components/Settings/Subscribe/Subscribe.messages.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/Settings/Subscribe/Subscribe.messages.js b/src/components/Settings/Subscribe/Subscribe.messages.js
index 0f12e0851..2ee5f7173 100644
--- a/src/components/Settings/Subscribe/Subscribe.messages.js
+++ b/src/components/Settings/Subscribe/Subscribe.messages.js
@@ -89,6 +89,11 @@ export default defineMessages({
     id: 'cboard.components.Settings.Subscribe.not_subscribed',
     defaultMessage: 'You are not subscribed. '
   },
+  unverified: {
+    id: 'cboard.components.Settings.Subscribe.unverified',
+    defaultMessage:
+      'An error ocurs during validation of your purchase. Please refresh'
+  },
   refresh: {
     id: 'cboard.components.Settings.Subscribe.refresh',
     defaultMessage: 'Refresh'

From 107dece943de1d0ad19efd3cec2fd23d7f4a6643 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 22 Sep 2023 16:40:38 -0300
Subject: [PATCH 21/39] Add unverified message to cboard.json

---
 src/translations/src/cboard.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json
index fb92d8fc6..47ad8238b 100644
--- a/src/translations/src/cboard.json
+++ b/src/translations/src/cboard.json
@@ -484,6 +484,7 @@
   "cboard.components.Settings.Subscribe.paused": "Your subscription was paused on: {e}",
   "cboard.components.Settings.Subscribe.on_hold": "Your subscription expired on: {e}",
   "cboard.components.Settings.Subscribe.not_subscribed": "You are not subscribed. ",
+  "cboard.components.Settings.Subscribe.unverified": "An error ocurs during validation of your purchase. Please refresh",
   "cboard.components.Settings.Subscribe.refresh": "Refresh",
   "cboard.components.Settings.Subscribe.error": "Oops something went wrong. Please try again later",
   "cboard.components.Settings.Subscribe.empty_product": "There are no subscription available at this moment. Please try again later.",

From 2fc1cc1026427111a9089db53bfeac93b83dd411 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 22 Sep 2023 16:41:57 -0300
Subject: [PATCH 22/39] Update owned product in case that user change
 subscription

---
 .../SubscriptionProvider.actions.js           | 45 ++++++++++++++++---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index db3dc7061..0d70ddb41 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -17,6 +17,7 @@ import {
 import API from '../../api';
 import { isLogged } from '../../components/App/App.selectors';
 import { isAndroid, isIOS } from '../../cordova-util';
+import { formatTitle } from '../../components/Settings/Subscribe/Subscribe.helpers';
 
 export function updateIsInFreeCountry() {
   return (dispatch, getState) => {
@@ -135,7 +136,37 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
           userId,
           requestOrigin
         );
+        const getActualProduct = async (product, transaction) => {
+          if (isIOS() && transaction.product_id !== product.subscriptionId) {
+            try {
+              const product = state.subscription.products.find(
+                product => product.subscriptionId === transaction.product_id
+              );
 
+              const newProduct = {
+                title: formatTitle(product.title),
+                billingPeriod: product.billingPeriod,
+                price: product.price,
+                tag: product.tag,
+                subscriptionId: product.subscriptionId
+              };
+              const apiProduct = {
+                product: {
+                  ...newProduct
+                }
+              };
+
+              await API.updateSubscriber(apiProduct);
+              return newProduct;
+            } catch (err) {
+              console.error(err);
+              return product;
+            }
+          }
+          return product;
+        };
+
+        const actualProduct = await getActualProduct(product, transaction);
         isSubscribed =
           status.toLowerCase() === ACTIVE ||
           status.toLowerCase() === CANCELED ||
@@ -143,14 +174,14 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
           status.toLowerCase() === IN_GRACE_PERIOD
             ? true
             : false;
-        if (product && isSubscribed) {
+        if (actualProduct && isSubscribed) {
           ownedProduct = {
-            billingPeriod: product.billingPeriod,
-            id: product._id,
-            price: product.price,
-            subscriptionId: product.subscriptionId,
-            tag: product.tag,
-            title: product.title,
+            billingPeriod: actualProduct.billingPeriod,
+            id: actualProduct._id,
+            price: actualProduct.price,
+            subscriptionId: actualProduct.subscriptionId,
+            tag: actualProduct.tag,
+            title: actualProduct.title,
             paypalSubscriptionId: transaction ? transaction.subscriptionId : '',
             platform: transaction ? transaction.platform : ''
           };

From f370e1104860a6b1d020a4353f16a9c5f27d426f Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 22 Sep 2023 17:51:37 -0300
Subject: [PATCH 23/39] Fix Account already bought a subscription on IOS

---
 src/components/Settings/Subscribe/Subscribe.container.js      | 2 +-
 src/components/Settings/Subscribe/SubscriptionPlans.js        | 3 ++-
 .../SubscriptionProvider/SubscriptionProvider.container.js    | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index be82394b4..48e4a772c 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -249,7 +249,7 @@ export class SubscribeContainer extends PureComponent {
           if (isIOS()) {
             //IOS have a unique receipt here => 'lastReceipt'
             const inAppPurchaseTransactions = filterInAppPurchaseIOSTransactions(
-              lastReceipt
+              localReceipts[0]
             );
 
             const lastTransaction = inAppPurchaseTransactions.slice(-1)[0];
diff --git a/src/components/Settings/Subscribe/SubscriptionPlans.js b/src/components/Settings/Subscribe/SubscriptionPlans.js
index dc7d69a4f..3777565d9 100644
--- a/src/components/Settings/Subscribe/SubscriptionPlans.js
+++ b/src/components/Settings/Subscribe/SubscriptionPlans.js
@@ -147,7 +147,8 @@ const SubscriptionPlans = ({
   const getMessage = () => {
     function errorMessage() {
       if (error && error.code === '0001') {
-        return messages.googleAccountAlreadyOwns;
+        if (isAndroid()) return messages.googleAccountAlreadyOwns;
+        if (isIOS()) return messages.appleAccountAlreadyOwns;
       }
       return messages.error;
     }
diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 03117eba5..d75864dc1 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -120,9 +120,11 @@ export class SubscriptionProvider extends Component {
       })
       .unverified(response => {
         if (isIOS()) {
+          const isAccountAlreadyBought =
+            response.payload.message === 'Transaction ID already exists';
           const { isInFreeCountry, isOnTrialPeriod } = this.props;
           updateSubscription({
-            status: UNVERIFIED,
+            status: isAccountAlreadyBought ? NOT_SUBSCRIBED : UNVERIFIED,
             isInFreeCountry: isInFreeCountry,
             isOnTrialPeriod: isOnTrialPeriod,
             isSubscribed: false,

From 0202e0240ffd9ebe28bc230a191b7bd4cb6e753d Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 22 Sep 2023 18:23:48 -0300
Subject: [PATCH 24/39] check if transaction and product exist on db before
 getActualProduct

---
 .../SubscriptionProvider/SubscriptionProvider.actions.js   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 0d70ddb41..64b64504d 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -137,7 +137,12 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
           requestOrigin
         );
         const getActualProduct = async (product, transaction) => {
-          if (isIOS() && transaction.product_id !== product.subscriptionId) {
+          if (
+            isIOS() &&
+            transaction &&
+            product &&
+            transaction.product_id !== product.subscriptionId
+          ) {
             try {
               const product = state.subscription.products.find(
                 product => product.subscriptionId === transaction.product_id

From 662df56938c17fc1098ddbe29684f787628a2b83 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Sun, 24 Sep 2023 22:48:50 -0300
Subject: [PATCH 25/39] Manage if IOS account already brought a subscription to
 another user

Should check cases that subscriptions for the other user is expired. user should can pay a subscription for a different user
---
 .../SubscriptionProvider.container.js         | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index d75864dc1..672076cec 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -11,7 +11,8 @@ import {
   updateSubscription,
   updatePlans,
   updateIsOnTrialPeriod,
-  showPremiumRequired
+  showPremiumRequired,
+  updateSubscriptionError
 } from './SubscriptionProvider.actions';
 import {
   ACTIVE,
@@ -107,7 +108,7 @@ export class SubscriptionProvider extends Component {
   };
 
   configInAppPurchasePlugin = () => {
-    const { updateSubscription } = this.props;
+    const { updateSubscription, updateSubscriptionError } = this.props;
 
     this.configPurchaseValidator();
 
@@ -122,6 +123,23 @@ export class SubscriptionProvider extends Component {
         if (isIOS()) {
           const isAccountAlreadyBought =
             response.payload.message === 'Transaction ID already exists';
+          if (isAccountAlreadyBought) {
+            const localReceipt = window.CdvPurchase.store.localReceipts[0];
+            localReceipt.finish();
+            window.CdvPurchase.store.finish(localReceipt);
+            updateSubscriptionError({
+              showError: true,
+              message: response.payload.message,
+              code: '0001'
+            });
+            setTimeout(() => {
+              updateSubscriptionError({
+                showError: false,
+                message: '',
+                code: ''
+              });
+            }, 3000);
+          }
           const { isInFreeCountry, isOnTrialPeriod } = this.props;
           updateSubscription({
             status: isAccountAlreadyBought ? NOT_SUBSCRIBED : UNVERIFIED,
@@ -182,6 +200,7 @@ const mapStateToProps = state => ({
 const mapDispatchToProps = {
   updateIsSubscribed,
   updateSubscription,
+  updateSubscriptionError,
   updatePlans,
   updateIsInFreeCountry,
   updateIsOnTrialPeriod,

From 5f934696ea39a2c983f05fbacea3be4d6a62da82 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Tue, 26 Sep 2023 14:02:20 -0300
Subject: [PATCH 26/39] Open the APP store web page on cancel a subscription in
 web or electron

---
 src/components/Settings/Subscribe/Subscribe.constants.js | 1 +
 src/components/Settings/Subscribe/SubscriptionInfo.js    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.constants.js b/src/components/Settings/Subscribe/Subscribe.constants.js
index 9818630cc..8f7a2262d 100644
--- a/src/components/Settings/Subscribe/Subscribe.constants.js
+++ b/src/components/Settings/Subscribe/Subscribe.constants.js
@@ -16,3 +16,4 @@ export const EMPTY_PRODUCT = 'empty_product';
 export const ON_TRIAL_PERIOD = 'on_trial_period';
 export const GOOGLE_PLAY_STORE_URL =
   'https://play.google.com/store/account/subscriptions';
+export const APP_STORE_URL = 'https://www.apple.com/app-store/';
diff --git a/src/components/Settings/Subscribe/SubscriptionInfo.js b/src/components/Settings/Subscribe/SubscriptionInfo.js
index e2a92b8c5..f90e62fdd 100644
--- a/src/components/Settings/Subscribe/SubscriptionInfo.js
+++ b/src/components/Settings/Subscribe/SubscriptionInfo.js
@@ -30,7 +30,7 @@ import {
 import RefreshIcon from '@material-ui/icons/Refresh';
 import IconButton from '../../UI/IconButton';
 import { isAndroid, isElectron, isIOS } from '../../../cordova-util';
-import { GOOGLE_PLAY_STORE_URL } from './Subscribe.constants';
+import { APP_STORE_URL, GOOGLE_PLAY_STORE_URL } from './Subscribe.constants';
 
 const propTypes = {
   ownedProduct: PropTypes.object.isRequired,
@@ -150,6 +150,13 @@ const SubscriptionInfo = ({
                 window.open(GOOGLE_PLAY_STORE_URL, '_blank');
               }
             }
+            if (!isIOS() && ownedProduct.platform === 'ios-appstore') {
+              if (isElectron()) {
+                window.cordova.plugins.DefaultBrowser.open(APP_STORE_URL);
+              } else {
+                window.open(APP_STORE_URL, '_blank');
+              }
+            }
           }}
           style={{ marginLeft: '1em' }}
         >

From 4b49a690b517932a723f41d798cc45633c7b32eb Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Thu, 28 Sep 2023 15:39:45 -0300
Subject: [PATCH 27/39] update variable name for product Id

---
 .../SubscriptionProvider/SubscriptionProvider.actions.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 64b64504d..b02e37ecb 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -141,11 +141,11 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
             isIOS() &&
             transaction &&
             product &&
-            transaction.product_id !== product.subscriptionId
+            transaction.productId !== product.subscriptionId
           ) {
             try {
               const product = state.subscription.products.find(
-                product => product.subscriptionId === transaction.product_id
+                product => product.subscriptionId === transaction.productId
               );
 
               const newProduct = {

From 52c5cf71ff6e53e93ce89ed922ce16897c229925 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 29 Sep 2023 17:32:46 -0300
Subject: [PATCH 28/39] Localize prices of subscriptions in IOS

---
 .../SubscriptionProvider.actions.js               | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index b02e37ecb..0dd757ca8 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -275,12 +275,16 @@ export function updatePlans() {
         : state.app.unloggedUserLocation?.countryCode;
       // get just subscriptions with active plans
       const plans = getActivePlans(data);
+      const iosProducts = isIOS() ? window.CdvPurchase.store.products : null;
       const products = plans.map(plan => {
+        const price = iosProducts
+          ? getIOSPrice(iosProducts, plan.subscriptionId)
+          : getPrice(plan.countries, 'US');
         const result = {
           id: plan.planId,
           subscriptionId: plan.subscriptionId,
           billingPeriod: plan.period,
-          price: getPrice(plan.countries, 'US'),
+          price: price,
           title: plan.subscriptionName,
           tag: plan.tags[0],
           paypalId: plan.paypalId
@@ -307,6 +311,15 @@ export function updatePlans() {
     return price;
   }
 
+  function getIOSPrice(iosProducts, productId) {
+    const product = iosProducts.find(product => product.id === productId);
+    const units = product.raw.priceMicros / 1000000;
+    return {
+      currencyCode: product?.raw?.currency,
+      units
+    };
+  }
+
   function getActivePlans(subscriptions) {
     let plans = [];
     if (subscriptions)

From 34eab0711a9d8fe7caa753ea2dfb4df359655890 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 29 Sep 2023 17:39:02 -0300
Subject: [PATCH 29/39] Fix price in US

Was added for testing purpose
---
 .../SubscriptionProvider/SubscriptionProvider.actions.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
index 0dd757ca8..83ffa9550 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -279,7 +279,7 @@ export function updatePlans() {
       const products = plans.map(plan => {
         const price = iosProducts
           ? getIOSPrice(iosProducts, plan.subscriptionId)
-          : getPrice(plan.countries, 'US');
+          : getPrice(plan.countries, locationCode);
         const result = {
           id: plan.planId,
           subscriptionId: plan.subscriptionId,

From 089cac92ce8afca990225b266f83f6f6bc50a411 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 29 Sep 2023 17:41:20 -0300
Subject: [PATCH 30/39] Fix error message

---
 src/components/Settings/Subscribe/Subscribe.messages.js | 2 +-
 src/translations/src/cboard.json                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.messages.js b/src/components/Settings/Subscribe/Subscribe.messages.js
index 2ee5f7173..08fa05288 100644
--- a/src/components/Settings/Subscribe/Subscribe.messages.js
+++ b/src/components/Settings/Subscribe/Subscribe.messages.js
@@ -92,7 +92,7 @@ export default defineMessages({
   unverified: {
     id: 'cboard.components.Settings.Subscribe.unverified',
     defaultMessage:
-      'An error ocurs during validation of your purchase. Please refresh'
+      'An error occurred during validation of your purchase. Please refresh'
   },
   refresh: {
     id: 'cboard.components.Settings.Subscribe.refresh',
diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json
index 47ad8238b..12565c6d1 100644
--- a/src/translations/src/cboard.json
+++ b/src/translations/src/cboard.json
@@ -484,7 +484,7 @@
   "cboard.components.Settings.Subscribe.paused": "Your subscription was paused on: {e}",
   "cboard.components.Settings.Subscribe.on_hold": "Your subscription expired on: {e}",
   "cboard.components.Settings.Subscribe.not_subscribed": "You are not subscribed. ",
-  "cboard.components.Settings.Subscribe.unverified": "An error ocurs during validation of your purchase. Please refresh",
+  "cboard.components.Settings.Subscribe.unverified": "An error occurred during validation of your purchase. Please refresh",
   "cboard.components.Settings.Subscribe.refresh": "Refresh",
   "cboard.components.Settings.Subscribe.error": "Oops something went wrong. Please try again later",
   "cboard.components.Settings.Subscribe.empty_product": "There are no subscription available at this moment. Please try again later.",

From 651f64de03bb556d594038f385582ac9b57add9f Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Fri, 29 Sep 2023 17:43:04 -0300
Subject: [PATCH 31/39] Remove purchase plugin verbosity

---
 src/cordova-util.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cordova-util.js b/src/cordova-util.js
index fd92b6c30..75b48df92 100644
--- a/src/cordova-util.js
+++ b/src/cordova-util.js
@@ -95,7 +95,6 @@ const configAppPurchasePlugin = () => {
 const IOSconfigureInAppPurchasePlugin = () => {
   const store = window.CdvPurchase.store;
   const { ProductType, Platform } = window.CdvPurchase; // shortcuts
-  store.verbosity = 4;
   store.register([
     {
       id: 'one_year_subscription',

From 7125bca10d1baf6695226d7b57139d117b62d2d7 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Wed, 4 Oct 2023 14:23:09 -0300
Subject: [PATCH 32/39] Remove unnecessary import of isIOS

---
 src/components/Settings/Settings.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Settings/Settings.component.js b/src/components/Settings/Settings.component.js
index 40ca29d6b..a6104d7de 100644
--- a/src/components/Settings/Settings.component.js
+++ b/src/components/Settings/Settings.component.js
@@ -25,7 +25,7 @@ import FullScreenDialog from '../UI/FullScreenDialog';
 import Paper from '@material-ui/core/Paper';
 import UserIcon from '../UI/UserIcon';
 import SettingsTour from './SettingsTour.component';
-import { isCordova, isAndroid, isIOS } from '../../cordova-util';
+import { isCordova, isAndroid } from '../../cordova-util';
 
 import './Settings.css';
 import { CircularProgress } from '@material-ui/core';

From 72aa983c910f1baa82deb90e2477f9baa4f8aaf3 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Wed, 4 Oct 2023 14:26:13 -0300
Subject: [PATCH 33/39] Avoid remove of subscription on offline mode or server
 error

---
 .../SubscriptionProvider/SubscriptionProvider.container.js   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 672076cec..276f41b6c 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -121,6 +121,11 @@ export class SubscriptionProvider extends Component {
       })
       .unverified(response => {
         if (isIOS()) {
+          const networError =
+            response.payload.message ===
+              'Unable to proceed with validation, Network Error' ||
+            'Unable to proceed with validation, timeout exceeded';
+          if (networError) return;
           const isAccountAlreadyBought =
             response.payload.message === 'Transaction ID already exists';
           if (isAccountAlreadyBought) {

From 289e6e5049c4c6c49a617b6fd4a940db45fa714f Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Wed, 4 Oct 2023 14:26:41 -0300
Subject: [PATCH 34/39] Small fix on verify purchase

---
 .../SubscriptionProvider/SubscriptionProvider.container.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
index 276f41b6c..e7f1b26cb 100644
--- a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
+++ b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -169,7 +169,7 @@ export class SubscriptionProvider extends Component {
           window.CdvPurchase.store.finish(receipt);
           return;
         }
-        if ([EXPIRED, NOT_SUBSCRIBED]) {
+        if ([EXPIRED, NOT_SUBSCRIBED].includes(state)) {
           const { isInFreeCountry, isOnTrialPeriod } = this.props;
           updateSubscription({
             status: state,

From c4cdd5f6c74274eceddae253d3abb41a21f2cefa Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Wed, 4 Oct 2023 14:27:16 -0300
Subject: [PATCH 35/39] Avoid push paypal products on IOS plans

---
 src/components/Settings/Subscribe/SubscriptionPlans.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Settings/Subscribe/SubscriptionPlans.js b/src/components/Settings/Subscribe/SubscriptionPlans.js
index 3777565d9..d024cd0f8 100644
--- a/src/components/Settings/Subscribe/SubscriptionPlans.js
+++ b/src/components/Settings/Subscribe/SubscriptionPlans.js
@@ -81,7 +81,7 @@ const SubscriptionPlans = ({
   } = subscription;
 
   let plans = [];
-  if (!isAndroid() && products) {
+  if (!(isAndroid() || isIOS()) && products) {
     products.forEach(product => {
       if (product.paypalId) plans.push(product);
     });

From 5df41b4d36364ead9bdd9305651afda2a9987892 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Wed, 4 Oct 2023 14:29:44 -0300
Subject: [PATCH 36/39] Show circular progress before update the subscriber to
 avoid confusions

---
 .../Settings/Subscribe/Subscribe.component.js       | 13 ++++++++++---
 .../Settings/Subscribe/Subscribe.container.js       | 10 +++++++---
 src/components/Settings/Subscribe/Subscribe.css     |  7 +++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/Settings/Subscribe/Subscribe.component.js b/src/components/Settings/Subscribe/Subscribe.component.js
index 1188b7721..0675b22f0 100644
--- a/src/components/Settings/Subscribe/Subscribe.component.js
+++ b/src/components/Settings/Subscribe/Subscribe.component.js
@@ -9,6 +9,7 @@ import './Subscribe.css';
 
 import SubscriptionInfo from './SubscriptionInfo';
 import SubscriptionPlans from './SubscriptionPlans';
+import { CircularProgress } from '@material-ui/core';
 
 const propTypes = {
   /**
@@ -29,7 +30,8 @@ const propTypes = {
   onRefreshSubscription: PropTypes.func,
   onSubscribeCancel: PropTypes.func.isRequired,
   onCancelSubscription: PropTypes.func.isRequired,
-  cancelSubscriptionStatus: PropTypes.string.isRequired
+  cancelSubscriptionStatus: PropTypes.string.isRequired,
+  updatingStatus: PropTypes.bool.isRequired
 };
 
 const defaultProps = {
@@ -46,7 +48,8 @@ const Subscribe = ({
   onSubscribeCancel,
   onPaypalApprove,
   onCancelSubscription,
-  cancelSubscriptionStatus
+  cancelSubscriptionStatus,
+  updatingStatus
 }) => {
   return (
     <div className="Subscribe">
@@ -56,7 +59,11 @@ const Subscribe = ({
         onClose={onClose}
         // fullWidth
       >
-        {!subscription.isSubscribed ? (
+        {updatingStatus ? (
+          <div className="Subscribe__Loading__Container">
+            <CircularProgress />
+          </div>
+        ) : !subscription.isSubscribed ? (
           <SubscriptionPlans
             subscription={subscription}
             onRefreshSubscription={onRefreshSubscription}
diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
index 48e4a772c..889bf00a7 100644
--- a/src/components/Settings/Subscribe/Subscribe.container.js
+++ b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -34,14 +34,17 @@ export class SubscribeContainer extends PureComponent {
   };
 
   state = {
-    cancelSubscriptionStatus: ''
+    cancelSubscriptionStatus: '',
+    updatingStatus: true
   };
 
-  componentDidMount() {
+  async componentDidMount() {
     const { updateIsSubscribed, updatePlans } = this.props;
     const requestOrigin =
       'Function: componentDidMount - Component: Subscribe Container';
-    updateIsSubscribed(requestOrigin);
+    this.setState({ updatingStatus: true });
+    await updateIsSubscribed(requestOrigin);
+    this.setState({ updatingStatus: false });
     updatePlans();
   }
 
@@ -351,6 +354,7 @@ export class SubscribeContainer extends PureComponent {
         onPaypalApprove={this.handlePaypalApprove}
         onCancelSubscription={this.handleCancelSubscription}
         cancelSubscriptionStatus={this.state.cancelSubscriptionStatus}
+        updatingStatus={this.state.updatingStatus}
       />
     );
   }
diff --git a/src/components/Settings/Subscribe/Subscribe.css b/src/components/Settings/Subscribe/Subscribe.css
index 687df3158..97b778ad0 100644
--- a/src/components/Settings/Subscribe/Subscribe.css
+++ b/src/components/Settings/Subscribe/Subscribe.css
@@ -1,3 +1,10 @@
+.Subscribe__Loading__Container {
+  padding: 1em;
+  height: 92vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .Subscribe__Alert {
   margin: 8px 0;
 }

From 3cc3570529d8cd283c987c459d4159ae655140b3 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Thu, 7 Dec 2023 23:20:19 -0300
Subject: [PATCH 37/39] Update the load board of a new folder when parentBoard
 is created on API

---
 src/components/Board/Board.actions.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Board/Board.actions.js b/src/components/Board/Board.actions.js
index cee628515..2602b092b 100644
--- a/src/components/Board/Board.actions.js
+++ b/src/components/Board/Board.actions.js
@@ -758,8 +758,20 @@ export function updateApiObjects(
       .then(res => {
         const updatedChildBoardId = res.id;
         //create - update parent board
+        const updateTilesParentBoard = () =>
+          parentBoard.tiles.map(tile => {
+            if (tile.loadBoard === childBoard.id)
+              return { ...tile, loadBoard: updatedChildBoardId };
+            return tile;
+          });
+        const updatedParentBoard = {
+          ...parentBoard,
+          tiles: createParentBoard
+            ? updateTilesParentBoard()
+            : parentBoard.tiles
+        };
         const action = createParentBoard ? createApiBoard : updateApiBoard;
-        return dispatch(action(parentBoard, parentBoard.id))
+        return dispatch(action(updatedParentBoard, parentBoard.id))
           .then(res => {
             const updatedParentBoardId = res.id;
             //add new boards to the active communicator

From 2057a71b019974b3be116226a36faa58fc5b1c37 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Thu, 7 Dec 2023 23:22:38 -0300
Subject: [PATCH 38/39] Add comments to improve the understanding of the logic
 of the code

---
 src/components/Board/Board.container.js | 7 ++++++-
 src/components/Board/Board.reducer.js   | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js
index ebee0820f..b437a59f4 100644
--- a/src/components/Board/Board.container.js
+++ b/src/components/Board/Board.container.js
@@ -644,7 +644,7 @@ export class BoardContainer extends Component {
 
     // Loggedin user?
     if ('name' in userData && 'email' in userData) {
-      await this.handleApiUpdates(tile);
+      await this.handleApiUpdates(tile); // this function could mutate tthe tile
       return;
     }
 
@@ -1125,6 +1125,7 @@ export class BoardContainer extends Component {
         //update the parent
         updateBoard(parentBoardData);
       }
+      // Untill here all is with shorts ids
       //api updates
       if (tile && tile.type === 'board') {
         //child becomes parent
@@ -1166,6 +1167,10 @@ export class BoardContainer extends Component {
           )
             .then(parentBoardId => {
               if (createParentBoard) {
+                console.log('parent board created', parentBoardData);
+                /* Here the parentBoardData is not updated with the values 
+                that updatedApiObjects store on the API. Inside the boards are already updated 
+                an the value is not replaced because the oldboard Id was replaced on the updateApiObjects inside createApiBoardSuccess */
                 replaceBoard(
                   { ...parentBoardData },
                   { ...parentBoardData, id: parentBoardId }
diff --git a/src/components/Board/Board.reducer.js b/src/components/Board/Board.reducer.js
index 03b5fd327..b7db1bd49 100644
--- a/src/components/Board/Board.reducer.js
+++ b/src/components/Board/Board.reducer.js
@@ -71,6 +71,8 @@ function tileReducer(board, action) {
       return {
         ...board,
         tiles: [...board.tiles, { ...action.tile }]
+        /* some times when a tile folder is created here the last tile change loadBoard to a long Id with no reason
+      action tile before this copy has a short ID*/
       };
     case DELETE_TILES:
       return {
@@ -165,6 +167,8 @@ function boardReducer(state = initialState, action) {
 
       if (prev.id !== current.id) {
         const boardIndex = boards.findIndex(b => b.id === prev.id);
+        /* On create a parent board the prev board doesn't exist with a short Id
+        because is already replaced by a long one */
         if (boardIndex >= 0) {
           boards[boardIndex] = current;
         }

From 5d07d1d601f298aee1c0a1de237bbb33e38a6a27 Mon Sep 17 00:00:00 2001
From: tomivm <tomivm98@gmail.com>
Date: Thu, 7 Dec 2023 23:23:44 -0300
Subject: [PATCH 39/39] Remove console log

---
 src/components/Board/Board.container.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Board/Board.container.js b/src/components/Board/Board.container.js
index b437a59f4..14afd000e 100644
--- a/src/components/Board/Board.container.js
+++ b/src/components/Board/Board.container.js
@@ -1167,7 +1167,6 @@ export class BoardContainer extends Component {
           )
             .then(parentBoardId => {
               if (createParentBoard) {
-                console.log('parent board created', parentBoardData);
                 /* Here the parentBoardData is not updated with the values 
                 that updatedApiObjects store on the API. Inside the boards are already updated 
                 an the value is not replaced because the oldboard Id was replaced on the updateApiObjects inside createApiBoardSuccess */