fixing #169 #204 #200 #198

threefoldtech · Feb 26, 2021 · ac951dc · ac951dc
1 parent 5f63d50
commit ac951dc
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 7 deletions.
diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_local.png
diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_staging.png
diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_testing.png
diff --git a/app/lib/screens/init_screen.dart b/app/lib/screens/init_screen.dart
@@ -16,8 +16,9 @@ class _InitState extends State<InitScreen> {
   InAppWebView iaWebView;
 
   finish(List<dynamic> params) async {
+    print("**** LOAD DONE ");
     saveInitDone();
-    Navigator.pop(context);
+    Navigator.pop(context, true);
   }
 
   addHandler() {

diff --git a/app/lib/screens/main_screen.dart b/app/lib/screens/main_screen.dart
@@ -56,15 +56,20 @@ class _AppState extends State<MainScreen> {
   }
 
   pushScreens() async {
+    print("checking internet connection now");
     await checkInternetConnection();
     await checkInternetConnectionWithOurServers();
     await checkIfAppIsUnderMaintenance();
     await checkIfAppIsUpToDate();
     // await checkIfDeviceIdIsCorrect();
 
     if (widget.initDone != null && !widget.initDone) {
-      await Navigator.push(
-          context, MaterialPageRoute(builder: (context) => InitScreen()));
+      InitScreen init = InitScreen();
+      bool accepted = false;
+      while (!accepted) {
+        accepted = !(await Navigator.push(
+            context, MaterialPageRoute(builder: (context) => init)) == null);
+      }
     }
 
     if (!widget.registered) {

diff --git a/app/lib/widgets/custom_dialog.dart b/app/lib/widgets/custom_dialog.dart
@@ -18,9 +18,26 @@ class CustomDialog extends StatefulWidget {
     this.image = Icons.person,
     this.hiddenaction,
   });
-
   show(context) {
-    show(context);
+    return showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext context) => CustomDialog(
+        image: Icons.error,
+        title: this.title,
+        description: this.description,
+        widgetDescription: this.widgetDescription,
+        actions: <Widget>[
+          //@todo make this configurable, ok;okcancel
+          FlatButton(
+            child: new Text("Ok"),
+            onPressed: () {
+              Navigator.pop(context);
+            },
+          )
+        ],
+      ),
+    );
   }
 
   @override

diff --git a/frontend/src/views/VerifySms/VerifySms.html b/frontend/src/views/VerifySms/VerifySms.html
@@ -15,10 +15,10 @@ <h1 class="headline white--text text-xs-center fw">
             </v-layout>
             <v-layout column align-center v-if="smsVerificationStatus.checked && smsVerificationStatus.valid">
               <v-icon :size="100" color="accent">check_circle</v-icon>
-              <p class="subheading pt-3">phone validated</p>
+              <p class="subheading pt-3">Phone Validated</p>
               <div v-if="isMobile">
                 <v-btn class="accent" @click="openApp">
-                  Open 3Bot app
+                  Open ThreeFold Connect app
                 </v-btn>
               </div>
             </v-layout>