Merge pull request #351 from shocknet/dev

Dev
shocknet · Nov 5, 2020 · 123c9b0 · 123c9b0
2 parents f62d4c2 + 5b710fd
commit 123c9b0
Show file tree

Hide file tree

Showing 295 changed files with 10,733 additions and 7,380 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,6 @@
   "typescript.tsdk": "node_modules/typescript/lib",
   "cSpell.words": [
     "unfollow"
-  ]
+  ],
+  "editor.formatOnSave": true
 }
diff --git a/android/app/src/main/assets/fonts/AntDesign.ttf b/android/app/src/main/assets/fonts/AntDesign.ttf
diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf
diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
diff --git a/android/app/src/main/assets/fonts/Fontisto.ttf b/android/app/src/main/assets/fonts/Fontisto.ttf
diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf
diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Black.ttf b/android/app/src/main/assets/fonts/Montserrat-Black.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-BlackItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-BlackItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Bold.ttf b/android/app/src/main/assets/fonts/Montserrat-Bold.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-BoldItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-BoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-ExtraBold.ttf b/android/app/src/main/assets/fonts/Montserrat-ExtraBold.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-ExtraBoldItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-ExtraBoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-ExtraLight.ttf b/android/app/src/main/assets/fonts/Montserrat-ExtraLight.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-ExtraLightItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-ExtraLightItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Italic.ttf b/android/app/src/main/assets/fonts/Montserrat-Italic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Light.ttf b/android/app/src/main/assets/fonts/Montserrat-Light.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-LightItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-LightItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Medium.ttf b/android/app/src/main/assets/fonts/Montserrat-Medium.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-MediumItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-MediumItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Regular.ttf b/android/app/src/main/assets/fonts/Montserrat-Regular.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-SemiBold.ttf b/android/app/src/main/assets/fonts/Montserrat-SemiBold.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-SemiBoldItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-SemiBoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-Thin.ttf b/android/app/src/main/assets/fonts/Montserrat-Thin.ttf
diff --git a/android/app/src/main/assets/fonts/Montserrat-ThinItalic.ttf b/android/app/src/main/assets/fonts/Montserrat-ThinItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/android/app/src/main/assets/fonts/ShockIcons.ttf b/android/app/src/main/assets/fonts/ShockIcons.ttf
diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf
diff --git a/android/app/src/main/java/com/shockwallet/MainActivity.java b/android/app/src/main/java/com/shockwallet/MainActivity.java
@@ -2,6 +2,9 @@
 
 import android.os.Bundle;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
@@ -15,6 +18,16 @@ protected String getMainComponentName() {
         return "shockwallet";
     }
 
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+      return new ReactActivityDelegate(this, getMainComponentName()) {
+        @Override
+        protected ReactRootView createRootView() {
+         return new RNGestureHandlerEnabledRootView(MainActivity.this);
+        }
+      };
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/android/app/src/main/java/com/shockwallet/NotificationService.java b/android/app/src/main/java/com/shockwallet/NotificationService.java
@@ -103,7 +103,9 @@ public void call(final Object... args) {
                 }
                 lastTX = last;
                 String id = last.substring(0,5)+"...";
-                doNotification("New Transaction","value: "+res.getString("amount")+"\nTx: "+last,R.drawable.icon,"");
+                int value = Integer.parseInt(res.getString("amount"));
+                float valueBTC = value / 100000000f;
+                doNotification("Transaction confirmed! "+String.valueOf(valueBTC)+" BTC","",R.drawable.icon,"");
             }catch (Exception e){
                 Log.d(TAG,"Tx err"+e.toString());
             }
@@ -122,7 +124,7 @@ public void call(final Object... args) {
                     return;
                 }
 
-                doNotification("New Invoice","value: "+res.getString("value"),R.drawable.icon,"");
+                doNotification("Payment Received! "+res.getString("value")+" sats","",R.drawable.icon,"");
             }catch (Exception e){
                 Log.d(TAG,"Inv err"+e.toString());
             }
@@ -476,7 +478,7 @@ public void onResponse( Response response) throws IOException {
                         NotificationService.ApiPubKey = resJson.getString("APIPublicKey");
 
                         //mSocket = IO.socket("http://"+NotificationService.ip+"?x-shockwallet-device-id=7601a723-b6d4-4020-95a6-6113fb40e2f8");
-                        mSocket = IO.socket("http://"+NotificationService.ip+"?x-shockwallet-device-id="+deviceId+"&IS_LND_SOCKET=true&IS_NOTIFICATIONS_SOCKET=true");
+                        mSocket = IO.socket("http://"+NotificationService.ip+"/default?x-shockwallet-device-id="+deviceId+"&IS_LND_SOCKET=true&IS_NOTIFICATIONS_SOCKET=true");
                         mSocket.on("transaction:new", newTransaction);
                         mSocket.on("invoice:new", newInvoice);
                         mSocket.on("ON_CHATS", newChat);

diff --git a/app/actions/FeedAction.js b/app/actions/FeedAction.js
diff --git a/app/actions/UsersActions.js b/app/actions/UsersActions.js
diff --git a/app/actions/feed.js b/app/actions/feed.js
diff --git a/app/actions/index.ts b/app/actions/index.ts
diff --git a/app/actions/me.ts b/app/actions/me.ts
diff --git a/app/actions/singleFeed.js b/app/actions/singleFeed.js
diff --git a/app/assets/fonts/Montserrat-Black.ttf b/app/assets/fonts/Montserrat-Black.ttf
diff --git a/app/assets/fonts/Montserrat-BlackItalic.ttf b/app/assets/fonts/Montserrat-BlackItalic.ttf
diff --git a/app/assets/fonts/Montserrat-Bold.ttf b/app/assets/fonts/Montserrat-Bold.ttf
diff --git a/app/assets/fonts/Montserrat-BoldItalic.ttf b/app/assets/fonts/Montserrat-BoldItalic.ttf
diff --git a/app/assets/fonts/Montserrat-ExtraBold.ttf b/app/assets/fonts/Montserrat-ExtraBold.ttf
diff --git a/app/assets/fonts/Montserrat-ExtraBoldItalic.ttf b/app/assets/fonts/Montserrat-ExtraBoldItalic.ttf
diff --git a/app/assets/fonts/Montserrat-ExtraLight.ttf b/app/assets/fonts/Montserrat-ExtraLight.ttf
diff --git a/app/assets/fonts/Montserrat-ExtraLightItalic.ttf b/app/assets/fonts/Montserrat-ExtraLightItalic.ttf
diff --git a/app/assets/fonts/Montserrat-Italic.ttf b/app/assets/fonts/Montserrat-Italic.ttf
diff --git a/app/assets/fonts/Montserrat-Light.ttf b/app/assets/fonts/Montserrat-Light.ttf
diff --git a/app/assets/fonts/Montserrat-LightItalic.ttf b/app/assets/fonts/Montserrat-LightItalic.ttf
diff --git a/app/assets/fonts/Montserrat-Medium.ttf b/app/assets/fonts/Montserrat-Medium.ttf
diff --git a/app/assets/fonts/Montserrat-MediumItalic.ttf b/app/assets/fonts/Montserrat-MediumItalic.ttf
diff --git a/app/assets/fonts/Montserrat-Regular.ttf b/app/assets/fonts/Montserrat-Regular.ttf
diff --git a/app/assets/fonts/Montserrat-SemiBold.ttf b/app/assets/fonts/Montserrat-SemiBold.ttf
diff --git a/app/assets/fonts/Montserrat-SemiBoldItalic.ttf b/app/assets/fonts/Montserrat-SemiBoldItalic.ttf
diff --git a/app/assets/fonts/Montserrat-Thin.ttf b/app/assets/fonts/Montserrat-Thin.ttf
diff --git a/app/assets/fonts/Montserrat-ThinItalic.ttf b/app/assets/fonts/Montserrat-ThinItalic.ttf