Merge pull request #1887 from Plant-for-the-Planet-org/feature/user-l…

…ocation New implementation for currency on native app
Plant-for-the-Planet-org · Mar 22, 2020 · 789260d · 789260d
2 parents 7a7a572 + 2a5c597
commit 789260d
Show file tree

Hide file tree

Showing 22 changed files with 2,347 additions and 1,641 deletions.
diff --git a/app/actions/apiRouting.js b/app/actions/apiRouting.js
@@ -2,8 +2,8 @@ const routes = require('../server/routes/fos_js_routes.json');
 import Routing from './router.min.js';
 import { debug } from '../debug';
 import { context } from '../config';
+import { getCdnMediaUrl } from './fetchConfig';
 import { getLocaleAsync } from './getLocale';
-import { getCdnMediaUrl } from './fetchLocation';
 Routing.setRoutingData(routes);
 
 export const getApiRoute = async (routeName, params) => {

diff --git a/app/actions/fetchLocation.js → app/actions/fetchConfig.js b/app/actions/fetchLocation.js → app/actions/fetchConfig.js
@@ -10,6 +10,7 @@ import { find } from 'lodash';
 import { setCurrencyAction } from './globalCurrency';
 // import { setCdnMedia } from '../reducers/configReducer';
 let cdnMedia = {};
+let currency = '';
 export function fetchLocation() {
   return dispatch => {
     if (!getItemSync('preferredCurrency')) {
@@ -29,17 +30,33 @@ export function fetchLocation() {
     }
   };
 }
+
+export function getCurrency() {
+  return currency;
+}
+
 export function getCdnMediaUrl() {
   return cdnMedia;
 }
 export function fetchConfig() {
-  return () => {
+  return dispatch => {
     // if (!getItemSync('preferredCurrency')) {
     getRequest('config_get')
       .then(data => {
         debug('Got config fetch data:', data.data);
         cdnMedia = data.data.cdnMedia;
 
+        // fake data manipulation for debug purpose, please remove this when debug finishes
+        // data.data.currency = 'USD';
+        // debug code ends
+
+        if (data.data && data.data.currency) {
+          currency = data.data.currency;
+          supportedCurrency.includes(data.data.currency) &&
+            dispatch(setCurrencyAction(data.data.currency));
+        } else {
+          dispatch(fetchLocation());
+        }
         // for now we are not storing those in redux, please uncomment this when you need these urls in your components
         // dispatch(setCdnMedia(data.data.cdnMedia));
       })

diff --git a/app/actions/updateUserProfile.js b/app/actions/updateUserProfile.js
@@ -137,10 +137,6 @@ export function updateUserProfile(data, profileType, forcePromisify) {
     return new Promise(function(resolve, reject) {
       putAuthenticatedRequest(profileTypeToReq[profileType], data)
         .then(res => {
-          debug(res.status);
-          debug(res);
-          debug(userProfileSchema);
-
           if (res.data && res.data instanceof Object) {
             if (res.data.merge) {
               dispatch(