adminnistrateur
/
ilink-world
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to fix notification transition bug

This commit is contained in:
Brice Zele 2020-09-15 14:53:59 +01:00
parent 9ba8e81274
commit f112d90468
25 changed files with 1172 additions and 1615 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
App.js
View File

@ -84,6 +84,7 @@ import RefundNanoCreditUser from './screens/nano-credit/RefundNanoCreditUser';
import CautionNanoCreditAgent from './screens/nano-credit/CautionNanoCreditAgent';
import EpargnerArgentUser from './screens/nano-credit/EpargnerArgentUser';
import CasserEpargneUser from './screens/nano-credit/CasserEpargneUser';
import { IlinkEmitter } from './utils/events';
const instructions = Platform.select({
ios: 'Press Cmd+R to reload,\n' + 'Cmd+D or shake for dev menu',
@ -382,7 +383,9 @@ export const AppNavigator = createSwitchNavigator({
supAdminApp: AppSuperAdministrator,
Auth: AuthStack
}, {
initialRouteName: 'first'
initialRouteName: 'first',
transitionConfig: () => ({
})
});
const AppContainer = createAppContainer(AppNavigator);
@ -471,24 +474,6 @@ class App extends React.Component {
console.log('openResult: ', openResult);
}
onIds = async (device) => {
console.log('Device info: ', device);
AsyncStorage.getAllKeys((err, keys) => {
AsyncStorage.multiGet(keys, (err, stores) => {
stores.map(async (result, i, store) => {
let key = store[i][0];
if (!_.isEqual(key, '@config:onesignalIds')) {
if (i === stores.length - 1) {
this._saveOneSignalIds(device.userId);
}
}
});
});
});
}
render() {
return (
<Provider store={store}>

1436
android/app/src/main/assets/index.android.bundle
View File

File diff suppressed because one or more lines are too long

BIN
android/app/src/main/res/drawable-hdpi/node_modules_reactnavigationstack_lib_module_views_assets_backicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 B

BIN
android/app/src/main/res/drawable-mdpi/node_modules_reactnavigationstack_lib_module_views_assets_backicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 100 B

BIN
android/app/src/main/res/drawable-mdpi/node_modules_reactnavigationstack_lib_module_views_assets_backiconmask.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
android/app/src/main/res/drawable-xhdpi/node_modules_reactnavigationstack_lib_module_views_assets_backicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 134 B

BIN
android/app/src/main/res/drawable-xxhdpi/node_modules_reactnavigationstack_lib_module_views_assets_backicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 167 B

BIN
android/app/src/main/res/drawable-xxxhdpi/node_modules_reactnavigationstack_lib_module_views_assets_backicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 207 B

1
android/app/src/main/res/raw/datas_json_identity_scan.json
View File

File diff suppressed because one or more lines are too long

788
android/app/src/main/res/raw/node_modules_reactnativevectoricons_dist_glyphmaps_fontawesome.json
View File

@ -1,788 +0,0 @@
{
"glass": 61440,
"music": 61441,
"search": 61442,
"envelope-o": 61443,
"heart": 61444,
"star": 61445,
"star-o": 61446,
"user": 61447,
"film": 61448,
"th-large": 61449,
"th": 61450,
"th-list": 61451,
"check": 61452,
"remove": 61453,
"close": 61453,
"times": 61453,
"search-plus": 61454,
"search-minus": 61456,
"power-off": 61457,
"signal": 61458,
"gear": 61459,
"cog": 61459,
"trash-o": 61460,
"home": 61461,
"file-o": 61462,
"clock-o": 61463,
"road": 61464,
"download": 61465,
"arrow-circle-o-down": 61466,
"arrow-circle-o-up": 61467,
"inbox": 61468,
"play-circle-o": 61469,
"rotate-right": 61470,
"repeat": 61470,
"refresh": 61473,
"list-alt": 61474,
"lock": 61475,
"flag": 61476,
"headphones": 61477,
"volume-off": 61478,
"volume-down": 61479,
"volume-up": 61480,
"qrcode": 61481,
"barcode": 61482,
"tag": 61483,
"tags": 61484,
"book": 61485,
"bookmark": 61486,
"print": 61487,
"camera": 61488,
"font": 61489,
"bold": 61490,
"italic": 61491,
"text-height": 61492,
"text-width": 61493,
"align-left": 61494,
"align-center": 61495,
"align-right": 61496,
"align-justify": 61497,
"list": 61498,
"dedent": 61499,
"outdent": 61499,
"indent": 61500,
"video-camera": 61501,
"photo": 61502,
"image": 61502,
"picture-o": 61502,
"pencil": 61504,
"map-marker": 61505,
"adjust": 61506,
"tint": 61507,
"edit": 61508,
"pencil-square-o": 61508,
"share-square-o": 61509,
"check-square-o": 61510,
"arrows": 61511,
"step-backward": 61512,
"fast-backward": 61513,
"backward": 61514,
"play": 61515,
"pause": 61516,
"stop": 61517,
"forward": 61518,
"fast-forward": 61520,
"step-forward": 61521,
"eject": 61522,
"chevron-left": 61523,
"chevron-right": 61524,
"plus-circle": 61525,
"minus-circle": 61526,
"times-circle": 61527,
"check-circle": 61528,
"question-circle": 61529,
"info-circle": 61530,
"crosshairs": 61531,
"times-circle-o": 61532,
"check-circle-o": 61533,
"ban": 61534,
"arrow-left": 61536,
"arrow-right": 61537,
"arrow-up": 61538,
"arrow-down": 61539,
"mail-forward": 61540,
"share": 61540,
"expand": 61541,
"compress": 61542,
"plus": 61543,
"minus": 61544,
"asterisk": 61545,
"exclamation-circle": 61546,
"gift": 61547,
"leaf": 61548,
"fire": 61549,
"eye": 61550,
"eye-slash": 61552,
"warning": 61553,
"exclamation-triangle": 61553,
"plane": 61554,
"calendar": 61555,
"random": 61556,
"comment": 61557,
"magnet": 61558,
"chevron-up": 61559,
"chevron-down": 61560,
"retweet": 61561,
"shopping-cart": 61562,
"folder": 61563,
"folder-open": 61564,
"arrows-v": 61565,
"arrows-h": 61566,
"bar-chart-o": 61568,
"bar-chart": 61568,
"twitter-square": 61569,
"facebook-square": 61570,
"camera-retro": 61571,
"key": 61572,
"gears": 61573,
"cogs": 61573,
"comments": 61574,
"thumbs-o-up": 61575,
"thumbs-o-down": 61576,
"star-half": 61577,
"heart-o": 61578,
"sign-out": 61579,
"linkedin-square": 61580,
"thumb-tack": 61581,
"external-link": 61582,
"sign-in": 61584,
"trophy": 61585,
"github-square": 61586,
"upload": 61587,
"lemon-o": 61588,
"phone": 61589,
"square-o": 61590,
"bookmark-o": 61591,
"phone-square": 61592,
"twitter": 61593,
"facebook-f": 61594,
"facebook": 61594,
"github": 61595,
"unlock": 61596,
"credit-card": 61597,
"feed": 61598,
"rss": 61598,
"hdd-o": 61600,
"bullhorn": 61601,
"bell": 61683,
"certificate": 61603,
"hand-o-right": 61604,
"hand-o-left": 61605,
"hand-o-up": 61606,
"hand-o-down": 61607,
"arrow-circle-left": 61608,
"arrow-circle-right": 61609,
"arrow-circle-up": 61610,
"arrow-circle-down": 61611,
"globe": 61612,
"wrench": 61613,
"tasks": 61614,
"filter": 61616,
"briefcase": 61617,
"arrows-alt": 61618,
"group": 61632,
"users": 61632,
"chain": 61633,
"link": 61633,
"cloud": 61634,
"flask": 61635,
"cut": 61636,
"scissors": 61636,
"copy": 61637,
"files-o": 61637,
"paperclip": 61638,
"save": 61639,
"floppy-o": 61639,
"square": 61640,
"navicon": 61641,
"reorder": 61641,
"bars": 61641,
"list-ul": 61642,
"list-ol": 61643,
"strikethrough": 61644,
"underline": 61645,
"table": 61646,
"magic": 61648,
"truck": 61649,
"pinterest": 61650,
"pinterest-square": 61651,
"google-plus-square": 61652,
"google-plus": 61653,
"money": 61654,
"caret-down": 61655,
"caret-up": 61656,
"caret-left": 61657,
"caret-right": 61658,
"columns": 61659,
"unsorted": 61660,
"sort": 61660,
"sort-down": 61661,
"sort-desc": 61661,
"sort-up": 61662,
"sort-asc": 61662,
"envelope": 61664,
"linkedin": 61665,
"rotate-left": 61666,
"undo": 61666,
"legal": 61667,
"gavel": 61667,
"dashboard": 61668,
"tachometer": 61668,
"comment-o": 61669,
"comments-o": 61670,
"flash": 61671,
"bolt": 61671,
"sitemap": 61672,
"umbrella": 61673,
"paste": 61674,
"clipboard": 61674,
"lightbulb-o": 61675,
"exchange": 61676,
"cloud-download": 61677,
"cloud-upload": 61678,
"user-md": 61680,
"stethoscope": 61681,
"suitcase": 61682,
"bell-o": 61602,
"coffee": 61684,
"cutlery": 61685,
"file-text-o": 61686,
"building-o": 61687,
"hospital-o": 61688,
"ambulance": 61689,
"medkit": 61690,
"fighter-jet": 61691,
"beer": 61692,
"h-square": 61693,
"plus-square": 61694,
"angle-double-left": 61696,
"angle-double-right": 61697,
"angle-double-up": 61698,
"angle-double-down": 61699,
"angle-left": 61700,
"angle-right": 61701,
"angle-up": 61702,
"angle-down": 61703,
"desktop": 61704,
"laptop": 61705,
"tablet": 61706,
"mobile-phone": 61707,
"mobile": 61707,
"circle-o": 61708,
"quote-left": 61709,
"quote-right": 61710,
"spinner": 61712,
"circle": 61713,
"mail-reply": 61714,
"reply": 61714,
"github-alt": 61715,
"folder-o": 61716,
"folder-open-o": 61717,
"smile-o": 61720,
"frown-o": 61721,
"meh-o": 61722,
"gamepad": 61723,
"keyboard-o": 61724,
"flag-o": 61725,
"flag-checkered": 61726,
"terminal": 61728,
"code": 61729,
"mail-reply-all": 61730,
"reply-all": 61730,
"star-half-empty": 61731,
"star-half-full": 61731,
"star-half-o": 61731,
"location-arrow": 61732,
"crop": 61733,
"code-fork": 61734,
"unlink": 61735,
"chain-broken": 61735,
"question": 61736,
"info": 61737,
"exclamation": 61738,
"superscript": 61739,
"subscript": 61740,
"eraser": 61741,
"puzzle-piece": 61742,
"microphone": 61744,
"microphone-slash": 61745,
"shield": 61746,
"calendar-o": 61747,
"fire-extinguisher": 61748,
"rocket": 61749,
"maxcdn": 61750,
"chevron-circle-left": 61751,
"chevron-circle-right": 61752,
"chevron-circle-up": 61753,
"chevron-circle-down": 61754,
"html5": 61755,
"css3": 61756,
"anchor": 61757,
"unlock-alt": 61758,
"bullseye": 61760,
"ellipsis-h": 61761,
"ellipsis-v": 61762,
"rss-square": 61763,
"play-circle": 61764,
"ticket": 61765,
"minus-square": 61766,
"minus-square-o": 61767,
"level-up": 61768,
"level-down": 61769,
"check-square": 61770,
"pencil-square": 61771,
"external-link-square": 61772,
"share-square": 61773,
"compass": 61774,
"toggle-down": 61776,
"caret-square-o-down": 61776,
"toggle-up": 61777,
"caret-square-o-up": 61777,
"toggle-right": 61778,
"caret-square-o-right": 61778,
"euro": 61779,
"eur": 61779,
"gbp": 61780,
"dollar": 61781,
"usd": 61781,
"rupee": 61782,
"inr": 61782,
"cny": 61783,
"rmb": 61783,
"yen": 61783,
"jpy": 61783,
"ruble": 61784,
"rouble": 61784,
"rub": 61784,
"won": 61785,
"krw": 61785,
"bitcoin": 61786,
"btc": 61786,
"file": 61787,
"file-text": 61788,
"sort-alpha-asc": 61789,
"sort-alpha-desc": 61790,
"sort-amount-asc": 61792,
"sort-amount-desc": 61793,
"sort-numeric-asc": 61794,
"sort-numeric-desc": 61795,
"thumbs-up": 61796,
"thumbs-down": 61797,
"youtube-square": 61798,
"youtube": 61799,
"xing": 61800,
"xing-square": 61801,
"youtube-play": 61802,
"dropbox": 61803,
"stack-overflow": 61804,
"instagram": 61805,
"flickr": 61806,
"adn": 61808,
"bitbucket": 61809,
"bitbucket-square": 61810,
"tumblr": 61811,
"tumblr-square": 61812,
"long-arrow-down": 61813,
"long-arrow-up": 61814,
"long-arrow-left": 61815,
"long-arrow-right": 61816,
"apple": 61817,
"windows": 61818,
"android": 61819,
"linux": 61820,
"dribbble": 61821,
"skype": 61822,
"foursquare": 61824,
"trello": 61825,
"female": 61826,
"male": 61827,
"gittip": 61828,
"gratipay": 61828,
"sun-o": 61829,
"moon-o": 61830,
"archive": 61831,
"bug": 61832,
"vk": 61833,
"weibo": 61834,
"renren": 61835,
"pagelines": 61836,
"stack-exchange": 61837,
"arrow-circle-o-right": 61838,
"arrow-circle-o-left": 61840,
"toggle-left": 61841,
"caret-square-o-left": 61841,
"dot-circle-o": 61842,
"wheelchair": 61843,
"vimeo-square": 61844,
"turkish-lira": 61845,
"try": 61845,
"plus-square-o": 61846,
"space-shuttle": 61847,
"slack": 61848,
"envelope-square": 61849,
"wordpress": 61850,
"openid": 61851,
"institution": 61852,
"bank": 61852,
"university": 61852,
"mortar-board": 61853,
"graduation-cap": 61853,
"yahoo": 61854,
"google": 61856,
"reddit": 61857,
"reddit-square": 61858,
"stumbleupon-circle": 61859,
"stumbleupon": 61860,
"delicious": 61861,
"digg": 61862,
"pied-piper-pp": 61863,
"pied-piper-alt": 61864,
"drupal": 61865,
"joomla": 61866,
"language": 61867,
"fax": 61868,
"building": 61869,
"child": 61870,
"paw": 61872,
"spoon": 61873,
"cube": 61874,
"cubes": 61875,
"behance": 61876,
"behance-square": 61877,
"steam": 61878,
"steam-square": 61879,
"recycle": 61880,
"automobile": 61881,
"car": 61881,
"cab": 61882,
"taxi": 61882,
"tree": 61883,
"spotify": 61884,
"deviantart": 61885,
"soundcloud": 61886,
"database": 61888,
"file-pdf-o": 61889,
"file-word-o": 61890,
"file-excel-o": 61891,
"file-powerpoint-o": 61892,
"file-photo-o": 61893,
"file-picture-o": 61893,
"file-image-o": 61893,
"file-zip-o": 61894,
"file-archive-o": 61894,
"file-sound-o": 61895,
"file-audio-o": 61895,
"file-movie-o": 61896,
"file-video-o": 61896,
"file-code-o": 61897,
"vine": 61898,
"codepen": 61899,
"jsfiddle": 61900,
"life-bouy": 61901,
"life-buoy": 61901,
"life-saver": 61901,
"support": 61901,
"life-ring": 61901,
"circle-o-notch": 61902,
"ra": 61904,
"resistance": 61904,
"rebel": 61904,
"ge": 61905,
"empire": 61905,
"git-square": 61906,
"git": 61907,
"y-combinator-square": 61908,
"yc-square": 61908,
"hacker-news": 61908,
"tencent-weibo": 61909,
"qq": 61910,
"wechat": 61911,
"weixin": 61911,
"send": 61912,
"paper-plane": 61912,
"send-o": 61913,
"paper-plane-o": 61913,
"history": 61914,
"circle-thin": 61915,
"header": 61916,
"paragraph": 61917,
"sliders": 61918,
"share-alt": 61920,
"share-alt-square": 61921,
"bomb": 61922,
"soccer-ball-o": 61923,
"futbol-o": 61923,
"tty": 61924,
"binoculars": 61925,
"plug": 61926,
"slideshare": 61927,
"twitch": 61928,
"yelp": 61929,
"newspaper-o": 61930,
"wifi": 61931,
"calculator": 61932,
"paypal": 61933,
"google-wallet": 61934,
"cc-visa": 61936,
"cc-mastercard": 61937,
"cc-discover": 61938,
"cc-amex": 61939,
"cc-paypal": 61940,
"cc-stripe": 61941,
"bell-slash": 61942,
"bell-slash-o": 61943,
"trash": 61944,
"copyright": 61945,
"at": 61946,
"eyedropper": 61947,
"paint-brush": 61948,
"birthday-cake": 61949,
"area-chart": 61950,
"pie-chart": 61952,
"line-chart": 61953,
"lastfm": 61954,
"lastfm-square": 61955,
"toggle-off": 61956,
"toggle-on": 61957,
"bicycle": 61958,
"bus": 61959,
"ioxhost": 61960,
"angellist": 61961,
"cc": 61962,
"shekel": 61963,
"sheqel": 61963,
"ils": 61963,
"meanpath": 61964,
"buysellads": 61965,
"connectdevelop": 61966,
"dashcube": 61968,
"forumbee": 61969,
"leanpub": 61970,
"sellsy": 61971,
"shirtsinbulk": 61972,
"simplybuilt": 61973,
"skyatlas": 61974,
"cart-plus": 61975,
"cart-arrow-down": 61976,
"diamond": 61977,
"ship": 61978,
"user-secret": 61979,
"motorcycle": 61980,
"street-view": 61981,
"heartbeat": 61982,
"venus": 61985,
"mars": 61986,
"mercury": 61987,
"intersex": 61988,
"transgender": 61988,
"transgender-alt": 61989,
"venus-double": 61990,
"mars-double": 61991,
"venus-mars": 61992,
"mars-stroke": 61993,
"mars-stroke-v": 61994,
"mars-stroke-h": 61995,
"neuter": 61996,
"genderless": 61997,
"facebook-official": 62000,
"pinterest-p": 62001,
"whatsapp": 62002,
"server": 62003,
"user-plus": 62004,
"user-times": 62005,
"hotel": 62006,
"bed": 62006,
"viacoin": 62007,
"train": 62008,
"subway": 62009,
"medium": 62010,
"yc": 62011,
"y-combinator": 62011,
"optin-monster": 62012,
"opencart": 62013,
"expeditedssl": 62014,
"battery-4": 62016,
"battery": 62016,
"battery-full": 62016,
"battery-3": 62017,
"battery-three-quarters": 62017,
"battery-2": 62018,
"battery-half": 62018,
"battery-1": 62019,
"battery-quarter": 62019,
"battery-0": 62020,
"battery-empty": 62020,
"mouse-pointer": 62021,
"i-cursor": 62022,
"object-group": 62023,
"object-ungroup": 62024,
"sticky-note": 62025,
"sticky-note-o": 62026,
"cc-jcb": 62027,
"cc-diners-club": 62028,
"clone": 62029,
"balance-scale": 62030,
"hourglass-o": 62032,
"hourglass-1": 62033,
"hourglass-start": 62033,
"hourglass-2": 62034,
"hourglass-half": 62034,
"hourglass-3": 62035,
"hourglass-end": 62035,
"hourglass": 62036,
"hand-grab-o": 62037,
"hand-rock-o": 62037,
"hand-stop-o": 62038,
"hand-paper-o": 62038,
"hand-scissors-o": 62039,
"hand-lizard-o": 62040,
"hand-spock-o": 62041,
"hand-pointer-o": 62042,
"hand-peace-o": 62043,
"trademark": 62044,
"registered": 62045,
"creative-commons": 62046,
"gg": 62048,
"gg-circle": 62049,
"tripadvisor": 62050,
"odnoklassniki": 62051,
"odnoklassniki-square": 62052,
"get-pocket": 62053,
"wikipedia-w": 62054,
"safari": 62055,
"chrome": 62056,
"firefox": 62057,
"opera": 62058,
"internet-explorer": 62059,
"tv": 62060,
"television": 62060,
"contao": 62061,
"500px": 62062,
"amazon": 62064,
"calendar-plus-o": 62065,
"calendar-minus-o": 62066,
"calendar-times-o": 62067,
"calendar-check-o": 62068,
"industry": 62069,
"map-pin": 62070,
"map-signs": 62071,
"map-o": 62072,
"map": 62073,
"commenting": 62074,
"commenting-o": 62075,
"houzz": 62076,
"vimeo": 62077,
"black-tie": 62078,
"fonticons": 62080,
"reddit-alien": 62081,
"edge": 62082,
"credit-card-alt": 62083,
"codiepie": 62084,
"modx": 62085,
"fort-awesome": 62086,
"usb": 62087,
"product-hunt": 62088,
"mixcloud": 62089,
"scribd": 62090,
"pause-circle": 62091,
"pause-circle-o": 62092,
"stop-circle": 62093,
"stop-circle-o": 62094,
"shopping-bag": 62096,
"shopping-basket": 62097,
"hashtag": 62098,
"bluetooth": 62099,
"bluetooth-b": 62100,
"percent": 62101,
"gitlab": 62102,
"wpbeginner": 62103,
"wpforms": 62104,
"envira": 62105,
"universal-access": 62106,
"wheelchair-alt": 62107,
"question-circle-o": 62108,
"blind": 62109,
"audio-description": 62110,
"volume-control-phone": 62112,
"braille": 62113,
"assistive-listening-systems": 62114,
"asl-interpreting": 62115,
"american-sign-language-interpreting": 62115,
"deafness": 62116,
"hard-of-hearing": 62116,
"deaf": 62116,
"glide": 62117,
"glide-g": 62118,
"signing": 62119,
"sign-language": 62119,
"low-vision": 62120,
"viadeo": 62121,
"viadeo-square": 62122,
"snapchat": 62123,
"snapchat-ghost": 62124,
"snapchat-square": 62125,
"pied-piper": 62126,
"first-order": 62128,
"yoast": 62129,
"themeisle": 62130,
"google-plus-circle": 62131,
"google-plus-official": 62131,
"fa": 62132,
"font-awesome": 62132,
"handshake-o": 62133,
"envelope-open": 62134,
"envelope-open-o": 62135,
"linode": 62136,
"address-book": 62137,
"address-book-o": 62138,
"vcard": 62139,
"address-card": 62139,
"vcard-o": 62140,
"address-card-o": 62140,
"user-circle": 62141,
"user-circle-o": 62142,
"user-o": 62144,
"id-badge": 62145,
"drivers-license": 62146,
"id-card": 62146,
"drivers-license-o": 62147,
"id-card-o": 62147,
"quora": 62148,
"free-code-camp": 62149,
"telegram": 62150,
"thermometer-4": 62151,
"thermometer": 62151,
"thermometer-full": 62151,
"thermometer-3": 62152,
"thermometer-three-quarters": 62152,
"thermometer-2": 62153,
"thermometer-half": 62153,
"thermometer-1": 62154,
"thermometer-quarter": 62154,
"thermometer-0": 62155,
"thermometer-empty": 62155,
"shower": 62156,
"bathtub": 62157,
"s15": 62157,
"bath": 62157,
"podcast": 62158,
"window-maximize": 62160,
"window-minimize": 62161,
"window-restore": 62162,
"times-rectangle": 62163,
"window-close": 62163,
"times-rectangle-o": 62164,
"window-close-o": 62164,
"bandcamp": 62165,
"grav": 62166,
"etsy": 62167,
"imdb": 62168,
"ravelry": 62169,
"eercast": 62170,
"microchip": 62171,
"snowflake-o": 62172,
"superpowers": 62173,
"wpexplorer": 62174,
"meetup": 62176
}

6
android/app/src/main/res/raw/route.json
View File

@ -58,5 +58,9 @@
"demandGroupNanoCreditDetail": "demandeValidationGroupe",
"adhererGroupNanoCredit": "adhererGroupNanoCredit",
"myNanoCreditGroup": "myNanoCreditGroup",
"askNanoCredit": "askNanoCredit"
"askNanoCredit": "askNanoCredit",
"refundNanoCreditUser": "refundNanoCreditUser",
"cautionNanoCreditAgent": "cautionNanoCreditAgent",
"epargnerArgentUser": "epargnerArgentUser",
"casserEpargneUser": "casserEpargneUser"
}

31
android/app/src/main/res/raw/utils_i18n_en.json
View File

@ -40,6 +40,7 @@
"AMOUNT_SUPERIOR_TO_PRINCIPAL_ACCOUNT": "Amount greater than that of the agent's main account",
"MAKE_DEPOSIT": "Make a deposit",
"MAKE_WITHDRAWAL": "Make withdrawal",
"WITHDRAWAL_TYPE": "Withdrawal mode",
"DEPOSIT_DESCRIPTION": "Make a deposit",
"ERROR_TRANSFER": "Transfer error",
"SUCCESS_TRANSFER": "Transfer done",
@ -47,6 +48,10 @@
"WITHDRAWAL_ERROR": "Withdrawal error",
"WALLET_TO_WALLET_SUCCESS_TRANSFER": "Wallet to wallet transfer successfully completed",
"DEPOSIT": "Deposit",
"EN_ATTENTE_DE_VALIDATION": "Waiting for validation",
"REMBOURSE": "Reimbursed",
"NON_VALIDE": "Invalid",
"VALIDE": "Validate",
"ENVOIE_ARGENT": "Send money",
"RETRAIT_ARGENT": "Receive money",
"CONFIRM_DEPOSIT": "Confirm deposit",
@ -54,6 +59,11 @@
"CHANGE_SOURCE_CARD": "Change the type of entry number",
"CHOOSE_SOURCE": "Choose source",
"CREDIT_CARD": "Credit card",
"CREDIT_ACCOUNT": "Credit account",
"SAVINGS_ACCOUNT": "Saving account",
"SAVINGS": "Savings",
"CREDITS": "Credits",
"PHONE_SET_AS_DEFAULT": "Default phone for notifications",
"NUMERO_DE_SERIE": "Serial number",
"NUMERO_DE_SERIE_DESCRIPTION": "Please enter the serial number",
"CARD_NUMBER_LABEL": "Card number",
@ -71,6 +81,9 @@
"DESTINATAIRE": "Recipient",
"WITHDRAWAL": "Withdrawal",
"LINK_CARD": "Link my card",
"HISTORY_SAVINGS": "Savings history",
"HISTORY_CREDIT": "Credit history",
"TRANSFER_IN_ACCOUNT": "Transfer in account",
"WITHDRAWAL_IN_CASH": "Withdrawal in cash",
"WITHDRAWAL_IN_CASH_DESCRIPTION": "Withdrawal money in cash",
"WITHDRAWAL_WALLET_TO_CASH": "Withdrawal wallet to cash",
@ -99,8 +112,11 @@
"DEPOSIT_CASH_TO_CASH": "Cash to cash",
"ENVOIE_CASH_TO_CASH": "Send money in cash to cash",
"TRANSACTION_DETAIL": "Transaction detail",
"DEMAND_DETAIL": "Demand detail",
"CODE_IBAN": "IBAN Code",
"FEES_AND_TAXES": "Fees and taxes",
"TAXES": "Taxes",
"INTERET": "Interest",
"SUCCESS_CREATION_GROUP": "Creation information",
"ERROR_CREATION_GROUP": "Creation error",
"ERROR_JOIN_GROUP": "Join error",
@ -110,6 +126,7 @@
"DELETE_DEMAND": "Deletion request",
"TYPE_DEMAND": "Demand type",
"GROUP_INFOS": "Fill in the group information",
"FILL_INFORMATION": "Please fill in the information",
"GROUP_CODE": "Group code",
"NOM_GROUP": "Group name",
"GROUP": "Group",
@ -141,11 +158,21 @@
"NANO_SANTE_DESCRIPTION": "Nano health description",
"CAUTION_TYPE": "Caution type",
"DEMAND_NANO_CREDIT": "Nano credit demand",
"REFUND_NANO_CREDIT": "Refund nano credit",
"REFUND_DONE": "Refund done",
"SAVE_MONEY": "Epargner de l'argent",
"SAVE_MONEY_TYPE": "Savings type",
"CAUTION_CREDIT": "Caution credit demand",
"ID_DEMAND": "Demand ID",
"DEMAND_DURATION_IN_MONTH": "Duration (in months)",
"PAIEMENT_FACTURE": "Bill payment",
"NUMERO_ABONNE": "Subscriber number",
"IDENTIFIANT_ETUDIANT": "Student ID",
"DEMAND_SEND": "Demand send",
"EPARGNE_DEPOSE": "Savings deposited",
"BREAK_EPARGNE": "Break my saving",
"BREAK_EPARGNE_DONE": "Break saving done",
"ID_EPARGNE": "Saving ID",
"NO_DEMAND_CREATION_GROUP": "No group creation request",
"WITHDRAWAL_DESCRIPTION": "Make a withdrawal",
"COMMISSION_ACCOUNT_TITLE": "Commission account",
@ -280,6 +307,8 @@
"QUIT": "Quit",
"QUIT_": "Quit",
"OK": "OK",
"SIMPLE": "Simple",
"BLOCKED": "Blocked",
"COMMISSION_FEES": "Commission fees",
"TOTAL": "Total",
"APP_FULLNAME": "Ilink World",
@ -309,8 +338,10 @@
"CANCEL": "Exit",
"CANCEL_LABEL": "Cancel",
"SUBMIT_LABEL": "Submit",
"PHISIC_SECURITY": "Physic security",
"ERROR_LABEL": "Error",
"SUCCESS": "Success",
"ETAT": "State",
"DEPOSIT_SUCCESS": "Deposit done successfully",
"TEXT_GUIDE_USER_1": "You have just connected.\n Your location is marked in the center of the map with the indication \"You are here\" ",
"TEXT_GUIDE_USER_3": "Clicking the '+' button will open the options menu",

31
android/app/src/main/res/raw/utils_i18n_fr.json
View File

@ -40,9 +40,14 @@
"ERROR_LABEL": "Erreur",
"DEPOSIT_SUCCESS": "Dépôt effectué avec succès",
"SUCCESS": "Succès",
"ETAT": "Etat",
"MY_ACCOUNT": "Mon compte",
"WALLET": "Wallet",
"DEPOSIT": "Dépôt",
"EN_ATTENTE_DE_VALIDATION": "En attente de validation",
"REMBOURSE": "Remboursé",
"NON_VALIDE": "Non validé",
"VALIDE": "Validé",
"ENVOIE_ARGENT": "Envoyer de l'argent",
"RETRAIT_ARGENT": "Retirer de l'argent",
"CONFIRM_DEPOSIT": "Confirmer le dépôt",
@ -53,9 +58,15 @@
"ENTER_VALID_SERIAL_NUMBER": "Veuillez renseigner un numéro de série correct",
"MAKE_DEPOSIT": "Effectuer un dépôt",
"MAKE_WITHDRAWAL": "Effectuer un retrait",
"WITHDRAWAL_TYPE": "Mode de paiement",
"CHOOSE_SOURCE": "Choisir la source",
"CHANGE_SOURCE_CARD": "Changer le type du numéro de saisie",
"CREDIT_CARD": "Carte de crédit",
"CREDIT_ACCOUNT": "Compte crédit",
"SAVINGS_ACCOUNT": "Compte épargne",
"SAVINGS": "Epargnes",
"CREDITS": "Crédits",
"PHONE_SET_AS_DEFAULT": "Téléphone par défaut pour les notifications",
"NUMERO_DE_SERIE": "Numéro de série",
"NUMERO_DE_SERIE_DESCRIPTION": "Veuillez saisir le numéro de série",
"CARD_NUMBER_LABEL": "Numéro de la carte",
@ -76,6 +87,9 @@
"WALLET_TO_WALLET_SUCCESS_TRANSFER": "Transfert de wallet à wallet effectué avec succès",
"WITHDRAWAL": "Retrait",
"LINK_CARD": "Lier ma carte",
"HISTORY_SAVINGS": "Historique des épargnes",
"HISTORY_CREDIT": "Historique des crédits",
"TRANSFER_IN_ACCOUNT": "Transfert dans le compte",
"WITHDRAWAL_IN_CASH": "Retrait en cash",
"WITHDRAWAL_IN_CASH_DESCRIPTION": "Retrait d'argent en cash",
"WITHDRAWAL_WALLET_TO_CASH": "Retrait de votre wallet vers cash",
@ -104,13 +118,17 @@
"DEPOSIT_CASH_TO_CASH": "Cash vers cash",
"ENVOIE_CASH_TO_CASH": "Envoie d'argent en cash vers cash",
"TRANSACTION_DETAIL": "Détail de la transaction",
"DEMAND_DETAIL": "Détail de la demande",
"FEES_AND_TAXES": "Frais et taxes",
"TAXES": "Taxes",
"INTERET": "Intérêt",
"CREATE_GROUP": "Créer un groupe",
"MANAGE_GROUP": "Gérer le groupe",
"VALIDATION_DEMAND": "Demandes de validation",
"DELETE_DEMAND": "Demande de suppression",
"TYPE_DEMAND": "Type de demande",
"GROUP_INFOS": "Renseigner les informations du groupe",
"FILL_INFORMATION": "Veuillez renseigner les informations",
"GROUP_CODE": "Code du groupe",
"SUCCESS_CREATION_GROUP": "Informations sur la création",
"ERROR_CREATION_GROUP": "Erreur de création",
@ -147,6 +165,12 @@
"NANO_SANTE_DESCRIPTION": "Nano santé iLink",
"CAUTION_TYPE": "Type de caution",
"DEMAND_NANO_CREDIT": "Demande de nano crédit",
"REFUND_NANO_CREDIT": "Rembourser un nano crédit",
"SAVE_MONEY": "Epargner de l'argent",
"SAVE_MONEY_TYPE": "Type d'épargne",
"REFUND_DONE": "Remboursement effectué",
"CAUTION_CREDIT": "Cautionner une demande de crédit",
"ID_DEMAND": "Identifiant de la demande",
"DEMAND_DURATION_IN_MONTH": "Durée (en mois)",
"PAIEMENT_FACTURE": "Paiement de facture",
"NUMERO_ABONNE": "Numéro d'abonnée",
@ -169,6 +193,10 @@
"DEPOSIT_TRANSACTION_HISTORY_DESCRIPTION": "Dépôt de",
"NO_WALLET_HISTORY": "Aucune transaction à ce jour",
"DEMAND_SEND": "Demande envoyé",
"EPARGNE_DEPOSE": "Epargne déposé",
"BREAK_EPARGNE_DONE": "Epargne cassé avec succès",
"BREAK_EPARGNE": "Casser mon épargne",
"ID_EPARGNE": "Identifiant de l'épargne",
"NO_DEMAND_CREATION_GROUP": "Aucune demande de création de groupe",
"NO_WALLET_ACTIVED": "Aucun wallet n'est activé pour votre compte",
"TRANSFER_TO_PRINCIPAL_ACCOUNT": "Transférer commissions",
@ -289,6 +317,8 @@
"TOTAL": "Total",
"QUIT_": "Quitter",
"OK": "OK",
"SIMPLE": "Simple",
"BLOCKED": "Bloqué",
"APP_FULLNAME": "Ilink World",
"GUIDE_TITLE": "Bienvenue dans le Guide de",
"GUIDE_USER_SIMPLE": "Guide pour un utilisateur",
@ -316,6 +346,7 @@
"CANCEL": "Quitter",
"CANCEL_LABEL": "Annuler",
"SUBMIT_LABEL": "Valider",
"PHISIC_SECURITY": "Sécurité physique",
"TEXT_GUIDE_USER_1": "Vous venez de vous Connecter.\n Votre localisation est marquée au centre de la carte avec l'indication \"Vous êtes ici\" ",
"TEXT_GUIDE_USER_3": "En cliquant sur le bouton '+' vous ouvrirez le menu d'options",
"TEXT_GUIDE_USER_4": "Cliquez sur un marqueur pour avoir les informations sur un point",

9
bash.exe.stackdump Normal file
View File

@ -0,0 +1,9 @@
Stack trace:
Frame Function Args
000FFFFA318 0018007164E (0018026F12D, 00180224DC6, 000FFFFA318, 000FFFF9210)
000FFFFA318 00180046669 (00000000000, 00000000000, 00000000000, 000FFFFFFFF)
000FFFFA318 001800466A2 (0018026F1E9, 000FFFFA1C8, 000FFFFA318, 00000000000)
000FFFFA318 001800BDFEF (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA318 001800BE20F (000FFFFA340, 00000000000, 00000000000, 00000000000)
000FFFFA3C0 001800BF4AD (000FFFFA340, 00000000000, 00000000000, 00000000000)
End of stack trace

2
package.json
View File

@ -8,7 +8,7 @@
"postinstall": "node ./fix-android/android-release-fix.js",
"release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/build/intermediates/res/merged/release/ && rm -rf android/app/src/main/res/drawable-* && rm -rf android/app/src/main/res/raw/* && cd android && ./gradlew assembleRelease && cd .. && adb install android/app/build/outputs/apk/release/app-release.apk",
"debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/ && cd android && ./gradlew assembleDebug && cd .. && adb install android/app/build/outputs/apk/debug/app-debug.apk",
"start-emulator": "emulator -avd Nexus_5X_API_R -dns-server 8.8.8.8",
"start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8",
"start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8",
"run-debug": "cd android && ./gradlew clean && cd .. && react-native run-android",
"run-release": "cd android && ./gradlew clean && cd .. && react-native run-android --variant=release"

229
screens/home/Home.js
View File

@ -11,6 +11,7 @@ import {
StatusBar, TouchableNativeFeedback, TouchableOpacity, BackHandler, Alert, ProgressBarAndroid
, FlatList
} from 'react-native';
import axios from "axios";
import IMap from './IMap'
import ActionButton from 'react-native-action-button';
import { CardView } from "react-native-cardview"
@ -23,13 +24,13 @@ import isEqual from 'lodash/isEqual';
import Button from 'apsl-react-native-button'
import I18n from 'react-native-i18n'
import { IlinkEmitter } from "./../../utils/events"
import _ from 'lodash';
import Configuration from "../../webservice/persistences/Configuration";
import { MaterialDialog } from "react-native-material-dialog";
import { ProgressDialog, Dialog } from 'react-native-simple-dialogs';
const countries = require("./../../utils/country_code.json")
import SnapSlider from 'react-native-snap-slider'
import SnapSlider, { displayName } from 'react-native-snap-slider'
import call from "react-native-phone-call";
import Icon from 'react-native-vector-icons/MaterialIcons';
import Geolocation from 'react-native-geolocation-service';
@ -49,9 +50,10 @@ import { bindActionCreators } from 'redux';
import getAuthApiKey from '../../webservice/AuthKeyApi';
import { connect } from 'react-redux';
import getWalletActivated from '../../webservice/WalletApi';
import { saveOnesignalIdsAction } from '../../webservice/OnesignalApi';
import { saveOnesignalIdsAction, saveOnesignalIdsReset } from '../../webservice/OnesignalApi';
import OneSignal from 'react-native-onesignal';
import NavigationService from '../../utils/NavigationService';
import { saveOnesignalIds } from '../../webservice/IlinkConstants';
const slideHeight = responsiveHeight(30) > 270 ? 270 : responsiveHeight(30)
@ -152,6 +154,100 @@ class Home extends BaseScreen {
});
}
onIds = async (device) => {
console.log('Device info: ', device);
AsyncStorage.getAllKeys((err, keys) => {
AsyncStorage.multiGet(keys, (err, stores) => {
stores.map(async (result, i, store) => {
console.warn("KEY MAP", store);
console.log("KEY SAVE " + store[i][0]);
let key = store[i][0];
if (i === 0) {
if (!_.isEqual(key, '@config:onesignalIds')) {
this._saveOneSignalIds(device.userId);
IlinkEmitter.emit("firstlaunch");
}
}
});
});
});
}
onFirstLaunch = () => {
console.warn("FIRST LAUNCH ON HOME");
readUser().then(async (user) => {
console.log("USER", user);
if (user) {
if (user !== undefined) {
if (user.phone !== undefined)
this.props.getAuthApiKey(user.phone);
const onesignalIds = await this._getOneSignalIds();
if (onesignalIds) {
console.log("ONESIGNAL", onesignalIds);
if (user !== undefined) {
if (user.category !== undefined) {
if (user.category === "geolocated") {
this.saveOneSignal(false, false, {
code_membre: user.user_code,
player_id: onesignalIds,
set_default: false
});
/* this.props.saveOnesignalIdsAction(false, {
code_membre: user.user_code,
player_id: onesignalIds,
set_default: false
}); */
}
} else {
this.saveOneSignal(true, {
user_code: user.user_code,
player_id: onesignalIds,
set_default: false
});
/* this.props.saveOnesignalIdsAction(true, {
user_code: user.user_code,
player_id: onesignalIds,
set_default: false
}); */
}
} //this.props.saveOnesignalIdsAction()
}
//this.props.getWalletActivated(user.agentId);
}
}
});
}
saveOneSignal = (isUser, data) => {
axios({
url: isUser ? `${saveOnesignalIds}/saveUser` : `${saveOnesignalIds}/saveAgent`,
method: 'POST',
data,
headers: {
'X-Localization': I18n.currentLocale()
}
})
.then(response => {
console.warn(response);
//this.renderOneSignalResponse();
})
.catch(error => {
console.warn(error);
/* if (error.response)
this.renderOneSignalResponse(error.response);
else if (error.request)
this.renderOneSignalResponse(error.request);
else
this.renderOneSignalResponse(error.message); */
});
}
navigationEventListener
_retrieveData = async () => {
try {
@ -190,38 +286,6 @@ class Home extends BaseScreen {
});
}); */
readUser().then(async (user) => {
console.log("USER", user);
if (user) {
if (user !== undefined) {
if (user.phone !== undefined)
this.props.getAuthApiKey(user.phone);
const onesignalIds = await this._getOneSignalIds();
if (onesignalIds) {
console.log("ONESIGNAL", onesignalIds);
if (user !== undefined) {
if (user.category !== undefined) {
if (user.category === "geolocated") {
this.props.saveOnesignalIdsAction(false, {
code_membre: user.user_code,
player_id: onesignalIds
});
}
} else {
this.props.saveOnesignalIdsAction(true, {
user_code: user.user_code,
player_id: onesignalIds
});
}
} //this.props.saveOnesignalIdsAction()
}
//this.props.getWalletActivated(user.agentId);
}
}
});
this.mounted = true;
this.configuration = new Configuration()
const { navigation } = this.props;
@ -619,6 +683,7 @@ class Home extends BaseScreen {
}
componentWillUnmount() {
OneSignal.removeEventListener('ids', this.onIds);
this.mounted = false;
this.blurListener.remove();
@ -640,9 +705,10 @@ class Home extends BaseScreen {
}
constructor(props) {
super(props, true);
super(props);
this.state = this.geInitialState();
this.mounted = false;
IlinkEmitter.on("firstlaunch", this.onFirstLaunch);
this.filterOptions = [
{ value: 5, label: "5 km" },
{ value: 15, label: "15 km" },
@ -657,6 +723,8 @@ class Home extends BaseScreen {
//IlinkEmitter.on("langueChange", this.updateLangue.bind(this))
OneSignal.addEventListener('ids', this.onIds);
};
/* updateLangue() {
@ -664,6 +732,26 @@ class Home extends BaseScreen {
this.forceUpdate();
} */
_getOneSignalIds = () => {
return new Promise(async (resolve, reject) => {
try {
const getElement = await AsyncStorage.getItem('@config:onesignalIds');
resolve(getElement);
} catch (error) {
reject(error);
}
});
}
_saveOneSignalIds = async (ids) => {
try {
await AsyncStorage.setItem('@config:onesignalIds', ids);
} catch (error) {
console.warn(error);
}
}
makeCardSearch() {
/* if (!this.state.isPubShow) { */
return (
@ -1114,6 +1202,7 @@ class Home extends BaseScreen {
geInitialState() {
return {
isSaveOneSignalDisplay: false,
region: {
latitude: 0,
longitude: 0,
@ -1159,6 +1248,7 @@ class Home extends BaseScreen {
myNetwork: {},
dialogNetworkVisible: false,
myPositionMarkerText: I18n.t("YOUR_THERE"),
isSaveOneSignalOK: false
};
};
onMarkerPress(marker) {
@ -1277,7 +1367,6 @@ class Home extends BaseScreen {
this.watchLocation();
}
}
}
})
@ -1417,6 +1506,56 @@ class Home extends BaseScreen {
</View>)
}
renderOneSignalResponse = (message) => {
Alert.alert(
I18n.t('PHISIC_SECURITY'),
"Message",
[{ text: "OK" }]
);
/* Alert.alert(
I18n.t('PHISIC_SECURITY'),
message,
[
{
text: I18n.t('REFUSED'),
onPress: () => {
}
},
{
text: I18n.t("SUBMIT_LABEL"), onPress: () => {
readUser().then((user) => {
if (user) {
if (user.category !== undefined && user.category !== null) {
if (user.category !== undefined) {
if (user.category === "geolocated") {
this.saveOneSignal(false, {
code_membre: user.user_code,
player_id: onesignalIds,
set_default: true
});
}
} else {
this.saveOneSignal(true, {
user_code: user.user_code,
player_id: onesignalIds,
set_default: true
});
}
}
}
});
}
}
],
{ cancelable: false }
) */
}
renderOldHome() {
return (
<View style={styles.container}>
@ -1426,7 +1565,7 @@ class Home extends BaseScreen {
translucent={true}
/>
{/* Start here to comment */}
{/* {
{
(this.state.loadingDialog || this.props.loading) ?
<View
style={{ position: "absolute", zIndex: 1, backgroundColor: "#00000050", width: this.state.loadingDialog ? responsiveWidth(100) : 0, height: this.state.loadingDialog ? responsiveHeight(100) : 0, flex: 1, justifyContent: 'center', alignItems: 'center' }}
@ -1462,7 +1601,7 @@ class Home extends BaseScreen {
this.setState({ showProgress: false })
Alert.alert(I18n.t("PROBLEM_OCCUR"), I18n.t("PROBLEM_OCCUR_DIRECTION"), [{ text: "Ok", onPress: () => { } }])
}}
/> */}
/>
{this.makeCardSearch()}
{this.makeSlidingUp()}
{this.makeDialogLoader()}
@ -1483,7 +1622,7 @@ class Home extends BaseScreen {
readUser().then((user) => {
if (user) {
this.setState({ user: user })
this.setState({ network: user.network });
this.setState({ network: user.network, isSaveOneSignalOK: true });
const myPosition = {
latitude: parseFloat(user.latitude),
@ -1509,7 +1648,6 @@ class Home extends BaseScreen {
this.watchLocation();
}
}
}
})
.catch((error) => {
@ -2260,13 +2398,18 @@ class Home extends BaseScreen {
const mapStateToProps = state => ({
loading: state.authKeyReducer.loading,
authKey: state.authKeyReducer.authKey,
error: state.authKeyReducer.error
error: state.authKeyReducer.error,
loadingSaveOneSignal: state.saveOnesignalReducer.loading,
resultSaveOneSignal: state.saveOnesignalReducer.result,
errorSaveOneSignal: state.saveOnesignalReducer.error,
});
const mapDispatchToProps = dispatch => bindActionCreators({
getAuthApiKey,
getWalletActivated,
saveOnesignalIdsAction
saveOnesignalIdsAction,
saveOnesignalIdsReset
}, dispatch);
export default connect(mapStateToProps, mapDispatchToProps)(Home);

2
screens/nano-credit/AskNanoCredit.js
View File

@ -80,7 +80,7 @@ class AskNanoCredit extends Component {
console.log("USER", user);
if (user) {
if (user !== undefined) {
this.props.getNanoCreditDemandDurationAction(user.id);
this.props.getNanoCreditDemandDurationAction({ id_user: user.id, type: "nano_credit" });
}
}
})

2
screens/nano-credit/CasserEpargneUser.js
View File

@ -135,7 +135,7 @@ class CasserEpargneUser extends Component {
return (isNil(champ) || isEqual(champ.length, 0));
}
onCasserEpargne = () => {
onSubmitCasserEpargne = () => {
const { idEpargne, password } = this.state;
if (this.ckeckIfFieldIsOK(idEpargne))

67
screens/nano-credit/EpargnerArgentUser.js
View File

@ -57,6 +57,7 @@ class EpargnerArgentUser extends Component {
codeSponsor: null,
nomGroupe: null,
codeSponsor: null,
displayDuration: false,
user: null,
montant: null,
password: null,
@ -80,8 +81,8 @@ class EpargnerArgentUser extends Component {
console.log("USER", user);
if (user) {
if (user !== undefined) {
this.props.getNanoCreditDemandDurationAction(user.id);
}
this.props.getNanoCreditDemandDurationAction({ id_user: user.id, type: "epargne" });
};
}
})
@ -241,8 +242,8 @@ class EpargnerArgentUser extends Component {
if (this.ckeckIfFieldIsOK(typeEpargneName))
this.typeEpargneAnim.shake(800);
else if (this.ckeckIfFieldIsOK(durationSelect))
this.typeEpargneAnim.shake(800);
else if (this.ckeckIfFieldIsOK(durationSelect) && this.state.displayDuration)
this.durationAnim.shake(800);
else if (this.ckeckIfFieldIsOK(montant) || !this.isMontantValid().isValid)
this.montantAnim.shake(800);
else {
@ -282,30 +283,6 @@ class EpargnerArgentUser extends Component {
<Text style={styles.subbigtitle}>{I18n.t('FILL_INFORMATION')}</Text>
<Animatable.View ref={(comp) => { this.typeEpargneAnim = comp }}
style={{
width: responsiveWidth(90),
height: 60,
marginTop: 20,
alignSelf: 'center',
borderRadius: 10,
paddingLeft: 20,
paddingRight: 20,
backgroundColor: 'white'
}}>
<Dropdown
label={I18n.t('DEMAND_DURATION_IN_MONTH')}
data={this.state.durations}
useNativeDriver={true}
value={this.state.durationSelect !== null ? this.state.durationSelect : ''}
onChangeText={(value, index, data) => {
this.setState({ durationSelect: value });
}}
valueExtractor={(value) => { return value.value }}
labelExtractor={(value) => { return value.value }}
/>
</Animatable.View>
<Animatable.View ref={(comp) => { this.typeEpargneAnim = comp }}
style={{
width: responsiveWidth(90),
@ -326,12 +303,15 @@ class EpargnerArgentUser extends Component {
if (value === I18n.t('SIMPLE'))
this.setState({
typeEpargneToSend: 'simple',
typeEpargneName: I18n.t('SIMPLE')
typeEpargneName: I18n.t('SIMPLE'),
displayDuration: false
});
else
this.setState({
typeEpargneToSend: 'blocked',
typeEpargneName: I18n.t('BLOCKED')
typeEpargneName: I18n.t('BLOCKED'),
displayDuration: true
})
}}
valueExtractor={(value) => { return value.name }}
@ -339,6 +319,33 @@ class EpargnerArgentUser extends Component {
/>
</Animatable.View>
{
this.state.displayDuration &&
<Animatable.View ref={(comp) => { this.durationAnim = comp }}
style={{
width: responsiveWidth(90),
height: 60,
marginTop: 20,
alignSelf: 'center',
borderRadius: 10,
paddingLeft: 20,
paddingRight: 20,
backgroundColor: 'white'
}}>
<Dropdown
label={I18n.t('DEMAND_DURATION_IN_MONTH')}
data={this.state.durations}
useNativeDriver={true}
value={this.state.durationSelect !== null ? this.state.durationSelect : ''}
onChangeText={(value, index, data) => {
this.setState({ durationSelect: value });
}}
valueExtractor={(value) => { return value.value }}
labelExtractor={(value) => { return value.value }}
/>
</Animatable.View>
}
<Animatable.View ref={(comp) => { this.montantAnim = comp }}>
<Fumi iconClass={FontAwesomeIcon} iconName={'money'}
label={I18n.t('AMOUNT')}

3
screens/optionMenu/OptionsMenu.js
View File

@ -8,7 +8,7 @@
import React, { Component } from 'react';
import { Platform, StyleSheet, Alert, FlatList, Text, View, TouchableOpacity, Linking } from 'react-native';
import { Platform, StyleSheet, Alert, FlatList, Text, View, TouchableOpacity, Linking, AsyncStorage } from 'react-native';
import ActionButton from 'react-native-action-button';
import Icon from 'react-native-vector-icons/Ionicons';
import { responsiveFontSize, responsiveHeight, responsiveWidth } from 'react-native-responsive-dimensions';
@ -544,6 +544,7 @@ export default class OptionsMenu extends Component {
text: I18n.t('YES'), onPress: () => {
disconnect().then(() => {
IlinkEmitter.emit("userdisconnect");
AsyncStorage.clear();
this.props.navigation.navigate("Auth")
})
}

3
screens/wallet/WalletDetailUser.js
View File

@ -486,7 +486,8 @@ class WalletDetailUser extends Component {
lottie: {
source: require("./../../datas/json/cedit-cards.json"),
loop: true
}
},
isNanoCredit: true
});
}
}

131
screens/wallet/WalletOptionSelect.js
View File

@ -14,10 +14,13 @@ import { IlinkEmitter } from "../../utils/events";
import { Provider, Appbar } from 'react-native-paper';
import { readUser } from '../../webservice/AuthApi';
import _ from 'lodash';
import Icons from 'react-native-vector-icons/Ionicons'
import { FontWeight, Typography } from '../../config/typography';
import LottieView from 'lottie-react-native';
import { isIlinkWorldWallet, optionDepotScreen, optionPaiementFactureSubScreen, displayToast } from '../../utils/UtilsFunction';
import chunk from 'lodash/chunk';
import thousands from 'thousands';
import Tag from '../../components/Tag';
class WalletOptionSelect extends Component {
@ -33,10 +36,20 @@ class WalletOptionSelect extends Component {
lottie: this.props.navigation.state.params.lottie,
onGoBack: this.props.navigation.state.params.onGoBack,
isIdentified: this.props.navigation.state.params.isIdentified || null,
isNanoCredit: this.props.navigation.state.params.hasOwnProperty('isNanoCredit'),
user: null
}
console.log("WALLET OPTION PROPS", this.props);
IlinkEmitter.on("langueChange", this.updateLangue.bind(this));
readUser().then((user) => {
if (user) {
if (user !== undefined) {
this.setState({ user });
}
}
});
}
static navigationOptions = ({ navigation }) => ({
@ -220,6 +233,80 @@ class WalletOptionSelect extends Component {
this.forceUpdate();
}
renderAccountDetail = (options) => (
<>
<View
style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
<View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
<View
style={{
flexDirection: 'row',
alignItems: 'center',
}}>
<View
style={[
styles.circlePoint,
{ backgroundColor: Color.primaryColor },
]}>
<Icons name='md-wallet'
size={28}
color={Color.whiteColor}
/>
</View>
<View>
<Text style={[Typography.title3, Color.primaryColor], { marginBottom: 3 }}>
{I18n.t('CREDIT_ACCOUNT')}
</Text>
{this.state.user !== null ?
<Text style={[Typography.body2]}>{`${thousands(this.state.user.balance_credit, ' ')} ${this.state.wallet.currency_code}`}</Text>
: null}
</View>
</View>
<View
style={{
flexDirection: 'row',
alignItems: 'center',
}}>
<View
style={[
styles.circlePoint,
{ backgroundColor: Color.primaryColor },
]}>
<Icons name='md-key'
size={28}
color={Color.whiteColor}
/>
</View>
<View>
<Text style={[Typography.title3, Color.primaryColor], { marginBottom: 3 }}>
{I18n.t('SAVINGS_ACCOUNT')}
</Text>
{this.state.user !== null ?
<Text style={[Typography.body2]}>{`${thousands(this.state.user.balance_epargne, ' ')} ${this.state.wallet.currency_code}`}</Text>
: null}
</View>
</View>
</View>
</View>
<View style={{ flexDirection: 'row', marginTop: 30, marginBottom: 10, flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Tag icon={<Icon name='update' size={20} color={Color.whiteColor} style={{ marginLeft: -15 }} />}
style={{ paddingRight: 10, width: 120, borderTopRightRadius: 0, borderBottomRightRadius: 0, borderRightWidth: 1, borderRightColor: Color.whiteColor }}
primary
onPress={() => {
}}>{I18n.t('SAVINGS')}
</Tag>
<Tag icon={<Icon name='update' size={20} color={Color.whiteColor} />} primary
style={{ width: 110, borderTopLeftRadius: 0, borderBottomLeftRadius: 0, }}>
{I18n.t('CREDIT')}
</Tag>
</View>
</>
);
render() {
return (
<Provider>
@ -243,16 +330,24 @@ class WalletOptionSelect extends Component {
<View style={styles.container}>
<View style={{
justifyContent: 'center',
alignItems: 'center'
}}>
<LottieView
style={styles.lottie}
source={this.state.lottie.source}
autoPlay
loop={this.state.lottie.loop}
/>
<View>
{
this.state.isNanoCredit ?
this.renderAccountDetail()
:
<View style={{
justifyContent: 'center',
alignItems: 'center'
}}>
<LottieView
style={styles.lottie}
source={this.state.lottie.source}
autoPlay
loop={this.state.lottie.loop}
/>
</View>
}
</View>
<View style={[styles.checkDefault, { borderBottomColor: Color.borderColor }]}>
@ -306,6 +401,14 @@ const styles = StyleSheet.create({
width: 540,
height: 240
},
circlePoint: {
width: 50,
height: 50,
borderRadius: 25,
marginRight: 5,
alignItems: 'center',
justifyContent: 'center',
},
checkDefault: {
flexDirection: "row",
justifyContent: "space-between",
@ -351,6 +454,10 @@ const styles = StyleSheet.create({
},
contentTitle: {
paddingTop: 12,
}
},
blockView: {
paddingVertical: 10,
borderBottomWidth: 0.5,
},
});

8
utils/i18n/en.json
View File

@ -59,6 +59,11 @@
"CHANGE_SOURCE_CARD": "Change the type of entry number",
"CHOOSE_SOURCE": "Choose source",
"CREDIT_CARD": "Credit card",
"CREDIT_ACCOUNT": "Credit account",
"SAVINGS_ACCOUNT": "Saving account",
"SAVINGS": "Savings",
"CREDITS": "Credits",
"PHONE_SET_AS_DEFAULT": "Default phone for notifications",
"NUMERO_DE_SERIE": "Serial number",
"NUMERO_DE_SERIE_DESCRIPTION": "Please enter the serial number",
"CARD_NUMBER_LABEL": "Card number",
@ -76,6 +81,8 @@
"DESTINATAIRE": "Recipient",
"WITHDRAWAL": "Withdrawal",
"LINK_CARD": "Link my card",
"HISTORY_SAVINGS": "Savings history",
"HISTORY_CREDIT": "Credit history",
"TRANSFER_IN_ACCOUNT": "Transfer in account",
"WITHDRAWAL_IN_CASH": "Withdrawal in cash",
"WITHDRAWAL_IN_CASH_DESCRIPTION": "Withdrawal money in cash",
@ -331,6 +338,7 @@
"CANCEL": "Exit",
"CANCEL_LABEL": "Cancel",
"SUBMIT_LABEL": "Submit",
"PHISIC_SECURITY": "Physic security",
"ERROR_LABEL": "Error",
"SUCCESS": "Success",
"ETAT": "State",

8
utils/i18n/fr.json
View File

@ -62,6 +62,11 @@
"CHOOSE_SOURCE": "Choisir la source",
"CHANGE_SOURCE_CARD": "Changer le type du numéro de saisie",
"CREDIT_CARD": "Carte de crédit",
"CREDIT_ACCOUNT": "Compte crédit",
"SAVINGS_ACCOUNT": "Compte épargne",
"SAVINGS": "Epargnes",
"CREDITS": "Crédits",
"PHONE_SET_AS_DEFAULT": "Téléphone par défaut pour les notifications",
"NUMERO_DE_SERIE": "Numéro de série",
"NUMERO_DE_SERIE_DESCRIPTION": "Veuillez saisir le numéro de série",
"CARD_NUMBER_LABEL": "Numéro de la carte",
@ -82,6 +87,8 @@
"WALLET_TO_WALLET_SUCCESS_TRANSFER": "Transfert de wallet à wallet effectué avec succès",
"WITHDRAWAL": "Retrait",
"LINK_CARD": "Lier ma carte",
"HISTORY_SAVINGS": "Historique des épargnes",
"HISTORY_CREDIT": "Historique des crédits",
"TRANSFER_IN_ACCOUNT": "Transfert dans le compte",
"WITHDRAWAL_IN_CASH": "Retrait en cash",
"WITHDRAWAL_IN_CASH_DESCRIPTION": "Retrait d'argent en cash",
@ -339,6 +346,7 @@
"CANCEL": "Quitter",
"CANCEL_LABEL": "Annuler",
"SUBMIT_LABEL": "Valider",
"PHISIC_SECURITY": "Sécurité physique",
"TEXT_GUIDE_USER_1": "Vous venez de vous Connecter.\n Votre localisation est marquée au centre de la carte avec l'indication \"Vous êtes ici\" ",
"TEXT_GUIDE_USER_3": "En cliquant sur le bouton '+' vous ouvrirez le menu d'options",
"TEXT_GUIDE_USER_4": "Cliquez sur un marqueur pour avoir les informations sur un point",

7
webservice/NanoCreditApi.js
View File

@ -198,7 +198,7 @@ export const askNanoCreditReset = () => {
}
}
export const getNanoCreditDemandDurationAction = (id) => {
export const getNanoCreditDemandDurationAction = (data) => {
const auth = store.getState().authKeyReducer;
const authKey = auth !== null ? `${auth.authKey.token_type} ${auth.authKey.access_token}` : '';
@ -207,8 +207,9 @@ export const getNanoCreditDemandDurationAction = (id) => {
dispatch(fetchGetNanoCreditDemandDurationPending());
axios({
url: `${getNanoCreditDemandDureationUrl}/${id}`,
method: 'GET',
url: `${getNanoCreditDemandDureationUrl}`,
method: 'POST',
data,
headers: {
'Authorization': authKey,
'X-Localization': I18n.currentLocale()