25-1/29/1

android/app/build.gradle

@@ -61,8 +61,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 113
+        versionCode = 117
-        versionName = '1.6.113'
+        versionName = '2.0.117'
         multiDexEnabled =true
 
         // manifestPlaceholders can be specified here if needed

android/app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
   <uses-feature android:name="android.hardware.camera.autofocus" />
 
   <application
-    android:label="SPEED"
+    android:label="Tripz"
     android:name="${applicationName}"
     android:icon="@mipmap/launcher_icon">
     <activity

ios/Runner/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Speed</string>
+	<string>Tripz</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleGetInfoString</key>
@@ -37,15 +37,15 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Speed</string>
+	<string>Tripz</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>83</string>
+	<string>92</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.3.83</string>
+	<string>5.0.92</string>
 	<key>NSHumanReadableCopyright</key>
 	<string></string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
@@ -57,7 +57,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
-	<string>Sefer app requires access to your camera in order to scan QR codes and capture
+	<string>Sovo app requires access to your camera in order to scan QR codes and capture
 			images for uploading and access to connect to a call.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Use Face ID to securely authenticate payment accounts.</string>

lib/constant/info.dart

@@ -1,6 +1,6 @@
 class AppInformation {
-  static const String companyName = 'SPEED llc';
+  static const String companyName = 'Tripz llc';
-  static const String appName = 'SPEED';
+  static const String appName = 'Tripz';
   static const String phoneNumber = '962798583052';
   static const String linkedInProfile =
       'https://www.linkedin.com/in/hamza-ayed/';
@@ -75,10 +75,10 @@ class AppInformation {
                         <div class="col-12">
                             <h1 style="color: black;font: 45px/50px MuseoSans900, Open Sans, sans-serif;">Terms and Conditions</h1>
                             <p><strong>1 TERMS OF USE</strong></p>
-                            <p>By downloading, browsing, accessing or using the Mobile Application; “SPEED”, Users agree to be bound by these Terms and Conditions of Use. We reserve the right to amend these terms and conditions at any time. If the User disagrees with any of these Terms and Conditions of Use, the User must immediately discontinue their access to the Mobile Application and their use of the services offered on the Mobile Application. Continued use of the Mobile Application will constitute acceptance of these Terms and Conditions of Use, as may be amended from time to time.</p>
+                            <p>By downloading, browsing, accessing or using the Mobile Application; “Tripz”, Users agree to be bound by these Terms and Conditions of Use. We reserve the right to amend these terms and conditions at any time. If the User disagrees with any of these Terms and Conditions of Use, the User must immediately discontinue their access to the Mobile Application and their use of the services offered on the Mobile Application. Continued use of the Mobile Application will constitute acceptance of these Terms and Conditions of Use, as may be amended from time to time.</p>
                             <p><strong>2.1. DEFINITIONS</strong></p>
                             <p>In these Terms and Conditions of Use, the following capitalized terms shall have the following meanings, except where the context otherwise requires:</p>
-                            <p>“Mobile Application” or “SPEED” refers to the smartphone software through which the company mediates services between Users and Service Providers.</p>
+                            <p>“Mobile Application” or “Tripz” refers to the smartphone software through which the company mediates services between Users and Service Providers.</p>
                             <p>"Account" means an account created by a User or a Service Provider on the Mobile Application as part of Registration.</p>
                             <p> “Service Providers” refers to the individuals or companies registered within the Company to provide products or services approved and mediated by the Company/Mobile Application and that are requested/purchased by “Users”. “Service Provider” means any one of them.</p>
                             <p>"Users" means users of the Mobile Application, including you and "User" means any one of them. “Users” also includes Service Providers using the Mobile Application version dedicated to the use of Service Providers.</p>
@@ -87,8 +87,8 @@ class AppInformation {
                             <p>"Redemption" means the act of redeeming such products or services.</p>
                             <p>"Register" means to create an Account on the Mobile Application and "Registration" means the act of creating such an Account.</p>
                             <p>"Services" means all the services provided by Service Providers via the Mobile Application and mediated by the Company to Users, and "Service" means any one of them.</p>
-                            <p><strong>2.2. WHAT IS THE MOBILE APPLICATION, “SPEED”?</strong></p>
+                            <p><strong>2.2. WHAT IS THE MOBILE APPLICATION, “Tripz”?</strong></p>
-                            <p>The “SPEED” Mobile Application consists in a specialize service with the purpose to schedule/match the Service Provider with the User, however without creating any employee relationship with the Service Provider, meaning that the Mobile Application should be considered only as a service mediator with the purpose of scheduling/matching between Users and Service Providers for the latter to fulfill the service requested by Users. Through the system, the Company allows, totally free of charge, the Users to sign up and request the desired available services from Service Providers in a more efficient way than the conventional existing methods. The Service Providers, by their means, can register on the Mobile Application dedicated for Service Providers through the methods indicated by the Company, pending an evaluation from the Company and the necessary documentation when signing up in accordance with guidelines set by the Transportation General Authority (TGA)  to provide services through the Mobile Application. The Service Provider will pay a profit margin fee determined by the Company -in knowledge of the Service Provider- per completed service. Users can pay their ride fare using Apple Pay as an additional payment method in Saudi Arabia on iPhones</p>
+                            <p>The “Tripz” Mobile Application consists in a specialize service with the purpose to schedule/match the Service Provider with the User, however without creating any employee relationship with the Service Provider, meaning that the Mobile Application should be considered only as a service mediator with the purpose of scheduling/matching between Users and Service Providers for the latter to fulfill the service requested by Users. Through the system, the Company allows, totally free of charge, the Users to sign up and request the desired available services from Service Providers in a more efficient way than the conventional existing methods. The Service Providers, by their means, can register on the Mobile Application dedicated for Service Providers through the methods indicated by the Company, pending an evaluation from the Company and the necessary documentation when signing up in accordance with guidelines set by the Transportation General Authority (TGA)  to provide services through the Mobile Application. The Service Provider will pay a profit margin fee determined by the Company -in knowledge of the Service Provider- per completed service. Users can pay their ride fare using Apple Pay as an additional payment method in Saudi Arabia on iPhones</p>
                             <p> </p>
                             <p><strong>3. GENERAL ISSUES ABOUT THE MOBILE APPLICATION AND THE SERVICES</strong></p>
                             <p><strong>3.1 Applicability of terms and conditions:</strong> The use of any Services and/or the Mobile Application and the making of any Redemptions are subject to these Terms and Conditions of Use.</p>
@@ -143,7 +143,7 @@ class AppInformation {
                             <p><strong>7.3 </strong>We do not give any warranty that the Services and the Mobile Application are free from viruses or anything else which may have a harmful effect on any technology.</p>
                             <p><strong>7.4 </strong>We reserve the right to change, modify, substitute, suspend or remove without notice any information or Services on the Mobile Application from time to time. Users’ access to the Mobile Application and/or the Services may also be occasionally restricted to allow for repairs, maintenance or the introduction of new facilities or services. We will attempt to restore such access as soon as we reasonably can. For the avoidance of doubt, we reserve the right to withdraw any information or Services from the Mobile Application at any time.</p>
                             <p><strong>7.5 </strong>We reserve the right to block access to and/or to edit or remove any material which in our reasonable opinion may give rise to a breach of these Terms and Conditions of Use.</p>
-                            <p><strong>7.6</strong> The acceptance and denial of the service request may occur at first by the Service Provider, who can accept or deny the service when receiving a notification for a request. The User may cancel the contract for any reason which may or may not apply cancellation fees for which the conditions and amount is determined and communicated by the Company. Both recognize that “SPEED” is not liable for any delays, cancellations, failure to cancel the contract and miscommunication between the User and the Service Provider, nor for any delay or failure in the delivery of services from the Service Provider.</p>
+                            <p><strong>7.6</strong> The acceptance and denial of the service request may occur at first by the Service Provider, who can accept or deny the service when receiving a notification for a request. The User may cancel the contract for any reason which may or may not apply cancellation fees for which the conditions and amount is determined and communicated by the Company. Both recognize that “Tripz” is not liable for any delays, cancellations, failure to cancel the contract and miscommunication between the User and the Service Provider, nor for any delay or failure in the delivery of services from the Service Provider.</p>
                             <p> </p>
                             <p><strong>8. SUSPENSION AND TERMINATION</strong></p>
                             <p><strong>8.1</strong> If the User uses (or others, with the User’s permission use) the Mobile Application, any Services in contravention of these Terms and Conditions of Use, we may suspend their use of the Services and/or Mobile Application.</p>
@@ -194,7 +194,7 @@ class AppInformation {
                             <p><strong>(f)</strong> We will protect personal information by reasonable security safeguards against loss or theft, as well as unauthorized access, disclosure, copying, use or modification.</p>
                             <p><strong>(g) </strong>The Company further reserves the right to use all legal means possible and to identify the Users, as well as to request, at any time, additional data and documents it considers appropriate in order to verify personal data informed by the user.</p>
                             <p>We are committed to conducting our business in accordance with these principles in order to ensure that the confidentiality of personal information is protected and maintained.</p>
-                            <p><strong>14.3 Social logins policy</strong><br>Our Services offers you the ability to register and login using Facebook. Where you choose to do this, we will receive certain profile information about you from your social media provider. The profile Information may include your name and social token.<br>We will use the information we receive only to associate your social token with your SPEED account or for the purposes that are described in this privacy policy. <br>‍<br><strong>14.4 Account and data deletion</strong><br>Based on the applicable laws of your country, you may have the right to request the deletion of your personal data  in some circumstances. If you want to delete your account or personal data in the application, please contact us via e-mail: support@mobile-app.store. We will respond to your request within 30 days.</p>
+                            <p><strong>14.3 Social logins policy</strong><br>Our Services offers you the ability to register and login using Facebook. Where you choose to do this, we will receive certain profile information about you from your social media provider. The profile Information may include your name and social token.<br>We will use the information we receive only to associate your social token with your Tripz account or for the purposes that are described in this privacy policy. <br>‍<br><strong>14.4 Account and data deletion</strong><br>Based on the applicable laws of your country, you may have the right to request the deletion of your personal data  in some circumstances. If you want to delete your account or personal data in the application, please contact us via e-mail: support@mobile-app.store. We will respond to your request within 30 days.</p>
                             <p><strong>15. In-Ride Policy</strong></p>
                             <p><strong>15.1 Smoking Policy: </strong></p>
                             <p>No smoking or other use of tobacco products (including, but not limited to, cigarettes, pipes, cigars, snuff, or chewing tobacco) is permitted during rides. No cigarette butts or other traces of smell, litter, or tobacco use should be present in the vehicle.  <img style="width: 5%;" id="content-img" src="https://classic.Seferme.com/media/48/download/No_Smoking.svg?v=1%22" alt="image"> </p>
@@ -2335,7 +2335,7 @@ double nearestDistance = double.infinity;</span>
                     <span title="Arabic (Egypt)" class="c12b5a4e69860bc968b47223fd-history-lng-name-to">Arabic (Egypt)</span>
                 </div>
             </div>
-            <span title="SPEED" class="c12b5a4e69860bc968b47223fd-history-item-text-from">SPEED</span>
+            <span title="Tripz" class="c12b5a4e69860bc968b47223fd-history-item-text-from">Tripz</span>
             <span title="سفر" class="c12b5a4e69860bc968b47223fd-history-item-text-to">سفر</span>
         </div>
         <div class="c12b5a4e69860bc968b47223fd-history-item-remove">
@@ -2359,8 +2359,8 @@ double nearestDistance = double.infinity;</span>
                     <span title="Arabic (Egypt)" class="c12b5a4e69860bc968b47223fd-history-lng-name-to">Arabic (Egypt)</span>
                 </div>
             </div>
-            <span title="write short description for my app SPEED in en and ar and tr" class="c12b5a4e69860bc968b47223fd-history-item-text-from">write short description for my app SPEED in en and ar and tr</span>
+            <span title="write short description for my app Tripz in en and ar and tr" class="c12b5a4e69860bc968b47223fd-history-item-text-from">write short description for my app Tripz in en and ar and tr</span>
-            <span title="اكتب وصفًا مختصرًا لتطبيقي SPEED باللغة en وar وtr" class="c12b5a4e69860bc968b47223fd-history-item-text-to">اكتب وصفًا مختصرًا لتطبيقي SPEED باللغة en وar وtr</span>
+            <span title="اكتب وصفًا مختصرًا لتطبيقي Tripz باللغة en وar وtr" class="c12b5a4e69860bc968b47223fd-history-item-text-to">اكتب وصفًا مختصرًا لتطبيقي Tripz باللغة en وar وtr</span>
         </div>
         <div class="c12b5a4e69860bc968b47223fd-history-item-remove">
             <img src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/delete-icon.svg" alt="delete history element">
@@ -2383,8 +2383,8 @@ double nearestDistance = double.infinity;</span>
                     <span title="Arabic (Egypt)" class="c12b5a4e69860bc968b47223fd-history-lng-name-to">Arabic (Egypt)</span>
                 </div>
             </div>
-            <span title="SPEED, güvenilir ve uygun fiyatlı sürücülerle buluşan bir taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-from">SPEED, güvenilir ve uygun fiyatlı sürücülerle buluşan bir taksi çağırma uygulamasıdır.</span>
+            <span title="Tripz, güvenilir ve uygun fiyatlı sürücülerle buluşan bir taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-from">Tripz, güvenilir ve uygun fiyatlı sürücülerle buluşan bir taksi çağırma uygulamasıdır.</span>
-            <span title="SPEED, güvenilir ve uygun fiyatlı sürüculerle bluşan bil taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-to">SPEED, güvenilir ve uygun fiyatlı sürüculerle bluşan bil taksi çağırma uygulamasıdır.</span>
+            <span title="Tripz, güvenilir ve uygun fiyatlı sürüculerle bluşan bil taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-to">Tripz, güvenilir ve uygun fiyatlı sürüculerle bluşan bil taksi çağırma uygulamasıdır.</span>
         </div>
         <div class="c12b5a4e69860bc968b47223fd-history-item-remove">
             <img src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/delete-icon.svg" alt="delete history element">
@@ -2407,7 +2407,7 @@ double nearestDistance = double.infinity;</span>
                     <span title="Arabic (Egypt)" class="c12b5a4e69860bc968b47223fd-history-lng-name-to">Arabic (Egypt)</span>
                 </div>
             </div>
-            <span title="SPEED, sizi bölgenizdeki güvenilir ve uygun fiyatlı sürücülerle buluşturan bir taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-from">SPEED, sizi bölgenizdeki güvenilir ve uygun fiyatlı sürücülerle buluşturan bir taksi çağırma uygulamasıdır.</span>
+            <span title="Tripz, sizi bölgenizdeki güvenilir ve uygun fiyatlı sürücülerle buluşturan bir taksi çağırma uygulamasıdır." class="c12b5a4e69860bc968b47223fd-history-item-text-from">Tripz, sizi bölgenizdeki güvenilir ve uygun fiyatlı sürücülerle buluşturan bir taksi çağırma uygulamasıdır.</span>
             <span title="علاوة على ذلك، فإن جميع أفراد العائلة والأصدقاء يستمتعون بالمزيد من الراحة من خلال سيارات الأجرة." class="c12b5a4e69860bc968b47223fd-history-item-text-to">علاوة على ذلك، فإن جميع أفراد العائلة والأصدقاء يستمتعون بالمزيد من الراحة من خلال سيارات الأجرة.</span>
         </div>
         <div class="c12b5a4e69860bc968b47223fd-history-item-remove">
@@ -2455,8 +2455,8 @@ double nearestDistance = double.infinity;</span>
                     <span title="Arabic (Egypt)" class="c12b5a4e69860bc968b47223fd-history-lng-name-to">Arabic (Egypt)</span>
                 </div>
             </div>
-            <span title="SPEED: Ride-hailing app for a seamless and affordable travel experience" class="c12b5a4e69860bc968b47223fd-history-item-text-from">SPEED: Ride-hailing app for a seamless and affordable travel experience</span>
+            <span title="Tripz: Ride-hailing app for a seamless and affordable travel experience" class="c12b5a4e69860bc968b47223fd-history-item-text-from">Tripz: Ride-hailing app for a seamless and affordable travel experience</span>
-            <span title="SPEED: تطبيق نقل الركاب لتجربة سفر سلسة وبأسعار معقولة" class="c12b5a4e69860bc968b47223fd-history-item-text-to">SPEED: تطبيق نقل الركاب لتجربة سفر سلسة وبأسعار معقولة</span>
+            <span title="Tripz: تطبيق نقل الركاب لتجربة سفر سلسة وبأسعار معقولة" class="c12b5a4e69860bc968b47223fd-history-item-text-to">Tripz: تطبيق نقل الركاب لتجربة سفر سلسة وبأسعار معقولة</span>
         </div>
         <div class="c12b5a4e69860bc968b47223fd-history-item-remove">
             <img src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/delete-icon.svg" alt="delete history element">
@@ -3322,19 +3322,19 @@ VALUES</span>
                             <select name="change-ext-lng-btn" id="c12b5a4e69860bc968b47223fd-change-ext-lng-btn"><option value="af">Afrikaans</option><option value="am">አማርኛ</option><option value="ar">عربى</option><option value="be">Default</option><option value="bg">Български</option><option value="ca">Català</option><option value="cs">České</option><option value="da">Dansk</option><option value="de">Deutsche</option><option value="el">Ελληνική</option><option value="en">English (USA)</option><option value="es">Español (EE. UU.)</option><option value="et">Eesti</option><option value="fa">فارسی</option><option value="fi">Suomen</option><option value="fr">Français</option><option value="hi">हिंदी</option><option value="hr">Hrvatski</option><option value="hu">Magyar</option><option value="id">Indonesia</option><option value="it">Italiano</option><option value="ja">日本語</option><option value="ko">한국어</option><option value="lt">Lietuvių</option><option value="lv">Latviešu</option><option value="ms">Melayu</option><option value="nl">Nederlandse</option><option value="no">Norsk</option><option value="pl">Polski</option><option value="pt">Portuguesa</option><option value="ro">Română</option><option value="ru">Русский</option><option value="sk">Slovenskej</option><option value="sl">Slovenščina</option><option value="sr">Руски</option><option value="sv">Svenska</option><option value="sw">Kiswahili</option><option value="th">ไทย</option><option value="tl">Default</option><option value="tr">Türk</option><option value="uk">Український</option><option value="vi">Việt nam</option><option value="zh">中國（台灣）</option><option value="zu">Zulu</option></select>
                         </div>
 
-                        <div class="c12b5a4e69860bc968b47223fd-change-voice-speed">
+                        <div class="c12b5a4e69860bc968b47223fd-change-voice-Tripz">
-                            <div class="c12b5a4e69860bc968b47223fd-speed-change-slider-header">
+                            <div class="c12b5a4e69860bc968b47223fd-Tripz-change-slider-header">
-                                <span>Voice Speed:</span>
+                                <span>Voice Tripz:</span>
 
                             </div>
-                            <div class="c12b5a4e69860bc968b47223fd-speed-change-slider-body">
+                            <div class="c12b5a4e69860bc968b47223fd-Tripz-change-slider-body">
-                                <img src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/speed_minus.svg" alt="speed icon">
+                                <img src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/Tripz_minus.svg" alt="Tripz icon">
 
                                 <div id="c12b5a4e69860bc968b47223fd-slider-range-min" class="ui-slider ui-corner-all ui-slider-horizontal ui-widget ui-widget-content">
                                     <div id="c12b5a4e69860bc968b47223fd-custom-handle" class="c12b5a4e69860bc968b47223fd-ui-slider-handle"></div>
                                 <div class="ui-slider-range ui-corner-all ui-widget-header ui-slider-range-min" style="width: 50%;"></div><span tabindex="0" class="ui-slider-handle ui-corner-all ui-state-default" style="left: 50%;"></span></div>
 
-                                <img class="c12b5a4e69860bc968b47223fd-svg-reverse" src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/speed_plus.svg" alt="speed icon">
+                                <img class="c12b5a4e69860bc968b47223fd-svg-reverse" src="chrome-extension://mnlohknjofogcljbcknkakphddjpijak/assets/Images/Tripz_plus.svg" alt="Tripz icon">
                             </div>
                             <div class="c12b5a4e69860bc968b47223fd-change-voice-gender">
                                 <span>Voice:</span>

lib/controller/auth/login_controller.dart

@@ -53,7 +53,7 @@ class LoginController extends GetxController {
     if (res != 'failure') {
       var d = jsonDecode(res);
 
-      isTest = d['message'][0]['isTest'];
+      isTest = int.parse(d['message'][0]['isTest'].toString());
       update();
     } else {
       return false;
@@ -108,10 +108,12 @@ class LoginController extends GetxController {
           box.write(BoxName.validity, d['validity']);
           box.write(BoxName.isInstall, d['isInstall'] ?? 'none');
           box.write(BoxName.isGiftToken, d['isGiftToken'] ?? 'none');
-          box.write(
+          d['inviteCode'] != null
-              BoxName.inviteCode,
+              ? box.write(
-              encryptionHelper.decryptData(d['inviteCode'].toString()) ??
+                  BoxName.inviteCode,
-                  'none');
+                  encryptionHelper.decryptData(d['inviteCode'].toString()) ??
+                      'none')
+              : null;
 
           var token = await CRUD().get(link: AppLink.getTokens, payload: {
             'passengerID': box.read(BoxName.passengerID).toString()
@@ -230,12 +232,11 @@ class LoginController extends GetxController {
   void login() async {
     isloading = true;
     update();
-    var res = await CRUD().get(
+    var res =
-        link: AppLink.loginFromGooglePassenger,
+        await CRUD().get(link: AppLink.loginFromGooglePassenger, payload: {
-        payload: {
+      'email': encryptionHelper.encryptData(emailController.text),
-          'email': emailController.text,
+      'id': passwordController.text
-          'id': passwordController.text
+    });
-        });
 
     isloading = false;
     update();
@@ -249,7 +250,7 @@ class LoginController extends GetxController {
       var jsonDecoeded = jsonDecode(res);
       if (jsonDecoeded.isNotEmpty) {
         if (jsonDecoeded['status'] == 'success' &&
-            jsonDecoeded['data'][0]['verified'] == 1) {
+            jsonDecoeded['data'][0]['verified'].toString() == '1') {
           //
           box.write(BoxName.isVerified, '1');
           box.write(BoxName.email, jsonDecoeded['data'][0]['email']);

lib/controller/auth/register_controller.dart

@@ -213,11 +213,11 @@ class RegisterController extends GetxController {
 
       var payload = {
         'id': box.read(BoxName.passengerID),
-        'phone': encryptionHelper.decryptData(phoneController.text),
+        'phone': encryptionHelper.encryptData(phoneController.text),
         'email': box.read(BoxName.email),
         'password': encryptionHelper.encryptData('unknown'),
         'gender': encryptionHelper.encryptData('unknown'),
-        'birthdate': '2002-01-01',
+        'birthdate': encryptionHelper.encryptData('2002-01-01'),
         'site': box.read(BoxName.passengerPhotoUrl) ?? 'unknown',
         'first_name': encryptionHelper.encryptData(firstName),
         'last_name': encryptionHelper.encryptData(lastName),

lib/controller/functions/crud.dart

@@ -60,6 +60,9 @@ class CRUD {
 
       if (response.statusCode == 200) {
         try {
+          // Log.print('req: ${response.request}');
+          // Log.print('response: ${response.body}');
+          // Log.print('payload: ${payload}');
           var jsonData = jsonDecode(response.body);
 
           if (jsonData['status'] == 'success') {

lib/controller/functions/secure_storage.dart

@@ -35,7 +35,7 @@ class AppInitializer {
 
   Future<void> initializeApp() async {
     await getKey();
-    await getAIKey('FCM_PRIVATE_KEY');
+    // await getAIKey('FCM_PRIVATE_KEY');
   }
 
   getAIKey(String key) async {

lib/controller/home/map_passenger_controller.dart

@@ -2889,7 +2889,7 @@ class MapPassengerController extends GetxController {
                 style: AppStyle.title,
               ),
               Text(
-                "Send SPEED app to him".tr,
+                "Send Tripz app to him".tr,
                 style: AppStyle.title.copyWith(color: AppColor.greenColor),
               )
             ],
@@ -2903,7 +2903,7 @@ class MapPassengerController extends GetxController {
                     : '+962${box.read(BoxName.sosPhonePassenger)}';
                 var message = '''Dear ,
 
-          🚀 I have just started an exciting trip and I would like to share the details of my journey and my current location with you in real-time! Please download the SPEED app. It will allow you to view my trip details and my latest location.
+          🚀 I have just started an exciting trip and I would like to share the details of my journey and my current location with you in real-time! Please download the Tripz app. It will allow you to view my trip details and my latest location.
 
           👉 Download link: 
           Android  [https://play.google.com/store/apps/details?id=com.mobileapp.store.ride]
@@ -2911,7 +2911,7 @@ class MapPassengerController extends GetxController {
 
           I look forward to keeping you close during my adventure!
 
-          SPEED ,'''
+          Tripz ,'''
                     .tr;
                 launchCommunication('whatsapp', phone, message);
               }),

lib/controller/home/profile/invit_controller.dart

@@ -39,9 +39,9 @@ class InviteController extends GetxController {
   Future<void> shareDriverCode() async {
     if (driverCouponCode != null) {
       final String shareText = '''
-Join SWIFTI as a driver using my referral code!
+Join Tripz as a driver using my referral code!
 Use code: $driverCouponCode
-Download the SWIFTI Driver app now and earn rewards!
+Download the Tripz Driver app now and earn rewards!
 ''';
       await Share.share(shareText);
     }
@@ -50,9 +50,9 @@ Download the SWIFTI Driver app now and earn rewards!
   Future<void> sharePassengerCode() async {
     if (couponCode != null) {
       final String shareText = '''
-Get a discount on your first SWIFTI ride!
+Get a discount on your first Tripz ride!
 Use my referral code: $couponCode
-Download the SWIFTI app now and enjoy your ride!
+Download the Tripz app now and enjoy your ride!
 ''';
       await Share.share(shareText);
     }
@@ -277,7 +277,7 @@ Download the SWIFTI app now and enjoy your ride!
       var d = response;
       Get.snackbar('Success', 'Invite sent successfully'.tr);
 
-      String message = '${'*SWIFTI APP CODE*'.tr}\n\n'
+      String message = '${'*Tripz APP CODE*'.tr}\n\n'
           '${"Use this code in registration".tr}\n'
           '${"To get a gift for both".tr}\n\n'
           '${"The period of this code is 1 hour".tr}\n\n'

lib/models/model/onboarding_model.dart

@@ -2,22 +2,22 @@ import 'package:get/get.dart';
 
 List<OnBoardingModel> onBoardingList = [
   OnBoardingModel(
-    title: 'Welcome to Sefer!'.tr,
+    title: 'Welcome to Tripz!'.tr,
     image: 'assets/images/on1.png',
     body:
-        'Sefer is the ride-hailing app that is safe, reliable, and accessible.'
+        'Tripz is the ride-hailing app that is safe, reliable, and accessible.'
             .tr,
   ),
   OnBoardingModel(
     title: 'Get to your destination quickly and easily.'.tr,
     image: 'assets/images/on2.png',
-    body: 'With Sefer, you can get a ride to your destination in minutes.'.tr,
+    body: 'With Tripz, you can get a ride to your destination in minutes.'.tr,
   ),
   OnBoardingModel(
     title: 'Enjoy a safe and comfortable ride.'.tr,
     image: 'assets/images/on3.png',
     body:
-        'Sefer is committed to safety, and all of our captains are carefully screened and background checked.'
+        'Tripz is committed to safety, and all of our captains are carefully screened and background checked.'
             .tr,
   ),
 ];

lib/views/auth/login_page.dart

@@ -320,10 +320,10 @@ class LoginPage extends StatelessWidget {
             onPressed: () async => await controller.getLocationPermission(),
             child: Text('Allow Location Access'.tr),
           ),
-          TextButton(
+          // TextButton(
-            onPressed: () => openAppSettings(),
+          //   onPressed: () => openAppSettings(),
-            child: Text('Open Settings'.tr),
+          //   child: Text('Open Settings'.tr),
-          ),
+          // ),
         ],
       ),
     );

lib/views/home/map_widget.dart/main_bottom_Menu_map.dart

@@ -459,7 +459,7 @@ class MainBottomMenuMap extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
-                '${'Where to'.tr} ${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[0]).toString()} ${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[1]).toString()}',
+                '${'Where to'.tr} ${encryptionHelper.decryptData(box.read(BoxName.name).toString().split(' ')[0])} ',
                 style: AppStyle.subtitle),
             // if (controller.noCarString)
             //   Text('Nearest Car: ~'.tr,

lib/views/home/profile/complaint_page.dart

@@ -125,7 +125,7 @@ class ComplaintPage extends StatelessWidget {
                         ),
                         const SizedBox(height: 24),
                         CupertinoFormSection(
-                          header: Text('SWIFTI answer'.tr),
+                          header: Text('Tripz answer'.tr),
                           children: [
                             SizedBox(
                               height: 100,