diff --git a/android/.project b/android/.project new file mode 100644 index 000000000..c3cb6f4fa --- /dev/null +++ b/android/.project @@ -0,0 +1,17 @@ + + + eSteem + Project android created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..e8895216f --- /dev/null +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir= +eclipse.preferences.version=1 diff --git a/android/app/.classpath b/android/app/.classpath new file mode 100644 index 000000000..32d669198 --- /dev/null +++ b/android/app/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/.project b/android/app/.project new file mode 100644 index 000000000..ac485d7c3 --- /dev/null +++ b/android/app/.project @@ -0,0 +1,23 @@ + + + app + Project app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/app/.settings/org.eclipse.buildship.core.prefs b/android/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..b1886adb4 --- /dev/null +++ b/android/app/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir=.. +eclipse.preferences.version=1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index dfb4e064d..620ffbfb2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -14,7 +14,6 @@ android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:largeHeap="true" android:theme="@style/AppTheme"> diff --git a/android/app/src/main/res/mipmap-hdpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-hdpi-v26/ic_foreground.png new file mode 100644 index 000000000..0358004c9 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-hdpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index cc8824339..0358004c9 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-ldpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-ldpi-v26/ic_foreground.png new file mode 100644 index 000000000..180027ffb Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-ldpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 000000000..180027ffb Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-mdpi-v26/ic_foreground.png new file mode 100644 index 000000000..f537052e8 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-mdpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 7258a68a3..f537052e8 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-xhdpi-v26/ic_foreground.png new file mode 100644 index 000000000..168006082 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-xhdpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index d8dc78b25..168006082 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-xxhdpi-v26/ic_foreground.png new file mode 100644 index 000000000..d49ea7618 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-xxhdpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d83516796..d49ea7618 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_foreground.png new file mode 100644 index 000000000..3d1f98061 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml new file mode 100644 index 000000000..4115c03d1 --- /dev/null +++ b/android/app/src/main/res/mipmap-xxxhdpi-v26/ic_launcher.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 9ef56f4a5..3d1f98061 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/values/colors-icon.xml b/android/app/src/main/res/values/colors-icon.xml new file mode 100644 index 000000000..c10793bf3 --- /dev/null +++ b/android/app/src/main/res/values/colors-icon.xml @@ -0,0 +1,3 @@ + +#FFFFFF + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9999de0eb..af5ded2ae 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -232,6 +232,8 @@ PODS: - React - react-native-randombytes (3.5.3): - React + - react-native-splash-screen (3.2.0): + - React - react-native-version-number (0.3.6): - React - react-native-webview (8.0.4): @@ -329,6 +331,7 @@ DEPENDENCIES: - react-native-fast-image (from `../node_modules/react-native-fast-image`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-randombytes (from `../node_modules/react-native-randombytes`) + - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - react-native-version-number (from `../node_modules/react-native-version-number`) - react-native-webview (from `../node_modules/react-native-webview`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) @@ -418,6 +421,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/netinfo" react-native-randombytes: :path: "../node_modules/react-native-randombytes" + react-native-splash-screen: + :path: "../node_modules/react-native-splash-screen" react-native-version-number: :path: "../node_modules/react-native-version-number" react-native-webview: @@ -496,6 +501,7 @@ SPEC CHECKSUMS: react-native-fast-image: 6d50167ad4d68b59640ceead8c2bc4e58d91d8bd react-native-netinfo: 8884d510fe67349940b4399c01db3e3591c922aa react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23 + react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f react-native-webview: 3f5aa91c3cb083ea4762e006b9653291a96a777a React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 diff --git a/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate b/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 7280e63ca..000000000 Binary files a/ios/eSteem.xcworkspace/xcuserdata/f.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/ios/eSteem/AppDelegate.m b/ios/eSteem/AppDelegate.m index 0b3020d1c..df697c695 100644 --- a/ios/eSteem/AppDelegate.m +++ b/ios/eSteem/AppDelegate.m @@ -5,6 +5,7 @@ * LICENSE file in the root directory of this source tree. */ +#import "RNSplashScreen.h" #import "AppDelegate.h" #import #import @@ -46,6 +47,7 @@ rootViewController.view = rootView; self.window.rootViewController = rootViewController; [self.window makeKeyAndVisible]; + [RNSplashScreen show]; return YES; } diff --git a/ios/eSteem/Base.lproj/LaunchScreen.xib b/ios/eSteem/Base.lproj/LaunchScreen.xib index 3f9d822a8..9296b97a7 100644 --- a/ios/eSteem/Base.lproj/LaunchScreen.xib +++ b/ios/eSteem/Base.lproj/LaunchScreen.xib @@ -1,64 +1,29 @@ - - - - + - + - - - Sansation-Bold - - - Sansation-Regular - - - - - - - - - - - - - - - - - + + - + - - + + + + - - - - + diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/eSteem/Images.xcassets/AppIcon.appiconset/Contents.json old mode 100755 new mode 100644 index 537008f60..c63089a03 --- a/ios/eSteem/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/eSteem/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,158 +1,158 @@ { - "images" : [ + "images": [ { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@2x.png", - "scale" : "2x" + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@2x.png", + "scale": "2x" }, { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "icon-20@3x.png", - "scale" : "3x" + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@3x.png", + "scale": "3x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@1x.png", - "scale" : "1x" + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@1x.png", + "scale": "1x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@2x.png", - "scale" : "2x" + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@2x.png", + "scale": "2x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "icon-29@3x.png", - "scale" : "3x" + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@3x.png", + "scale": "3x" }, { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-40@2x.png", - "scale" : "2x" + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@2x.png", + "scale": "2x" }, { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "icon-40@3x.png", - "scale" : "3x" + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@3x.png", + "scale": "3x" }, { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon-57@1x.png", - "scale" : "1x" + "size": "57x57", + "idiom": "iphone", + "filename": "icon-57@1x.png", + "scale": "1x" }, { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "icon-57@2x.png", - "scale" : "2x" + "size": "57x57", + "idiom": "iphone", + "filename": "icon-57@2x.png", + "scale": "2x" }, { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@2x.png", - "scale" : "2x" + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@2x.png", + "scale": "2x" }, { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "icon-60@3x.png", - "scale" : "3x" + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@3x.png", + "scale": "3x" }, { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20@1x.png", - "scale" : "1x" + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20@1x.png", + "scale": "1x" }, { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "icon-20@2x.png", - "scale" : "2x" + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20@2x.png", + "scale": "2x" }, { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29@1x.png", - "scale" : "1x" + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29@1x.png", + "scale": "1x" }, { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "icon-29@2x.png", - "scale" : "2x" + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29@2x.png", + "scale": "2x" }, { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40@1x.png", - "scale" : "1x" + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40@1x.png", + "scale": "1x" }, { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "icon-40@2x.png", - "scale" : "2x" + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40@2x.png", + "scale": "2x" }, { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50@1x.png", - "scale" : "1x" + "size": "50x50", + "idiom": "ipad", + "filename": "icon-50@1x.png", + "scale": "1x" }, { - "size" : "50x50", - "idiom" : "ipad", - "filename" : "icon-50@2x.png", - "scale" : "2x" + "size": "50x50", + "idiom": "ipad", + "filename": "icon-50@2x.png", + "scale": "2x" }, { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72@1x.png", - "scale" : "1x" + "size": "72x72", + "idiom": "ipad", + "filename": "icon-72@1x.png", + "scale": "1x" }, { - "size" : "72x72", - "idiom" : "ipad", - "filename" : "icon-72@2x.png", - "scale" : "2x" + "size": "72x72", + "idiom": "ipad", + "filename": "icon-72@2x.png", + "scale": "2x" }, { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76@1x.png", - "scale" : "1x" + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76@1x.png", + "scale": "1x" }, { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "icon-76@2x.png", - "scale" : "2x" + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76@2x.png", + "scale": "2x" }, { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "icon-83.5@2x.png", - "scale" : "2x" + "size": "83.5x83.5", + "idiom": "ipad", + "filename": "icon-83.5@2x.png", + "scale": "2x" }, { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "icon-1024@1x.png", - "scale" : "1x" + "size": "1024x1024", + "idiom": "ios-marketing", + "filename": "icon-1024@1x.png", + "scale": "1x" } ], - "info" : { - "version" : 1, - "author" : "xcode" + "info": { + "version": 1, + "author": "xcode" } } diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png index 9c6a7936e..caa93c9ea 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-1024@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@1x.png index 61ff3b832..466ae0a4a 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@2x.png index d793866bd..7f3dfe1b6 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@3x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@3x.png index 3aec2591f..cd4e878df 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@3x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@1x.png index aedd37888..8bb8fc814 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@2x.png index 5167c709e..d853f5381 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@3x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@3x.png index ef52327ce..df9890697 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@3x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@1x.png index d793866bd..7f3dfe1b6 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@2x.png index d6c611cc0..6a3130c9f 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@3x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@3x.png index 074e9b6ca..b74488ca2 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@3x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@1x.png index f7f91b029..a58b625bc 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@2x.png index d105e25a0..bad5ef3f5 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-50@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@1x.png index 75b6eb6f2..3032a403a 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@2x.png index 93aa929cd..9470a10ca 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-57@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@2x.png index 074e9b6ca..b74488ca2 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@3x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@3x.png index 74a6476c9..7ee7336e5 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@3x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@1x.png index ad5082aa5..24fa760bb 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@2x.png index 5c0514a3f..61d52cc79 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-72@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@1x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@1x.png index f2162da26..e4e82f6cc 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@1x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@1x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@2x.png index dd48d0742..f4ff7552c 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 9a575eae1..9cbb3ef1a 100755 Binary files a/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/ios/eSteem/Images.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/ios/eSteem/Images.xcassets/SplashImage.imageset/Contents.json b/ios/eSteem/Images.xcassets/SplashImage.imageset/Contents.json new file mode 100644 index 000000000..65d65473c --- /dev/null +++ b/ios/eSteem/Images.xcassets/SplashImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "splash@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "splash@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "splash@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@1x.png b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@1x.png new file mode 100644 index 000000000..ec99c0b0c Binary files /dev/null and b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@1x.png differ diff --git a/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@2x.png b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@2x.png new file mode 100644 index 000000000..16629fcad Binary files /dev/null and b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@2x.png differ diff --git a/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@3x.png b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@3x.png new file mode 100644 index 000000000..6d42c9add Binary files /dev/null and b/ios/eSteem/Images.xcassets/SplashImage.imageset/splash@3x.png differ diff --git a/package.json b/package.json index b6a433d73..c6c685b95 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "eSteem", + "name": "Esteem", "version": "2.2.5", "private": true, "rnpm": { @@ -30,6 +30,7 @@ "@esteemapp/react-native-multi-slider": "^1.1.0", "@esteemapp/react-native-render-html": "^4.1.5", "@esteemapp/react-native-slider": "^0.12.0", + "@hivechain/dsteem": "^0.12.12", "@react-native-community/async-storage": "^1.7.1", "@react-native-community/cameraroll": "^1.3.0", "@react-native-community/netinfo": "^5.3.3", @@ -46,7 +47,7 @@ "crypto-js": "^3.1.9-1", "currency-symbol-map": "^4.0.4", "diff-match-patch": "^1.0.4", - "dsteem": "esteemapp/dsteem", + "hivesigner": "^3.1.3", "intl": "^1.2.5", "jsc-android": "^241213.1.0", "lodash": "^4.17.13", @@ -78,6 +79,7 @@ "react-native-reanimated": "^1.3.0", "react-native-scrollable-tab-view": "esteemapp/react-native-scrollable-tab-view", "react-native-snap-carousel": "^3.8.0", + "react-native-splash-screen": "^3.2.0", "react-native-svg": "^9.5.3", "react-native-swiper": "^1.6.0-rc.3", "react-native-vector-icons": "^6.6.0", @@ -106,6 +108,7 @@ "devDependencies": { "@babel/core": "^7.6.2", "@babel/runtime": "^7.6.2", + "@bam.tech/react-native-make": "^2.0.0", "@react-native-community/eslint-config": "^0.0.5", "babel-eslint": "^10.0.1", "babel-jest": "^24.9.0", diff --git a/resources/icon.jpg b/resources/icon.jpg new file mode 100644 index 000000000..796d524d9 Binary files /dev/null and b/resources/icon.jpg differ diff --git a/resources/icon.psd b/resources/icon.psd index 1e3515767..82d05b15e 100644 Binary files a/resources/icon.psd and b/resources/icon.psd differ diff --git a/resources/icon_android.jpg b/resources/icon_android.jpg new file mode 100644 index 000000000..6f6bc0c17 Binary files /dev/null and b/resources/icon_android.jpg differ diff --git a/resources/icon_android.psd b/resources/icon_android.psd index 5cd25b58b..1a8275e37 100644 Binary files a/resources/icon_android.psd and b/resources/icon_android.psd differ diff --git a/resources/splash.jpg b/resources/splash.jpg new file mode 100644 index 000000000..5e46d18c0 Binary files /dev/null and b/resources/splash.jpg differ diff --git a/resources/splash.psd b/resources/splash.psd index 3ffef2f0f..e815cd54a 100644 Binary files a/resources/splash.psd and b/resources/splash.psd differ diff --git a/src/assets/esteem.png b/src/assets/esteem.png index eb07e62b2..1663685f4 100644 Binary files a/src/assets/esteem.png and b/src/assets/esteem.png differ diff --git a/src/assets/esteem@2x.png b/src/assets/esteem@2x.png index 23ea93d94..ff1003bc8 100644 Binary files a/src/assets/esteem@2x.png and b/src/assets/esteem@2x.png differ diff --git a/src/assets/esteem@3x.png b/src/assets/esteem@3x.png index e9229845e..28ed6e78f 100644 Binary files a/src/assets/esteem@3x.png and b/src/assets/esteem@3x.png differ diff --git a/src/assets/esteem_logo_transparent.png b/src/assets/esteem_logo_transparent.png index 632321c5a..7b6e125a4 100644 Binary files a/src/assets/esteem_logo_transparent.png and b/src/assets/esteem_logo_transparent.png differ diff --git a/src/assets/esteem_logo_transparent@2x.png b/src/assets/esteem_logo_transparent@2x.png index eaeeca6a9..b775157f9 100644 Binary files a/src/assets/esteem_logo_transparent@2x.png and b/src/assets/esteem_logo_transparent@2x.png differ diff --git a/src/assets/esteem_logo_transparent@3x.png b/src/assets/esteem_logo_transparent@3x.png index b79dab652..776cccd87 100644 Binary files a/src/assets/esteem_logo_transparent@3x.png and b/src/assets/esteem_logo_transparent@3x.png differ diff --git a/src/assets/no_image.png b/src/assets/no_image.png index dff0d8e2a..f1f2d319e 100644 Binary files a/src/assets/no_image.png and b/src/assets/no_image.png differ diff --git a/src/assets/no_image@2x.png b/src/assets/no_image@2x.png index 624f9e9bd..a8411daf5 100644 Binary files a/src/assets/no_image@2x.png and b/src/assets/no_image@2x.png differ diff --git a/src/assets/no_image@3x.png b/src/assets/no_image@3x.png index a14e371a1..8194dc03e 100644 Binary files a/src/assets/no_image@3x.png and b/src/assets/no_image@3x.png differ diff --git a/src/assets/side_menu_background.png b/src/assets/side_menu_background.png index 2ead21d29..11843b99d 100644 Binary files a/src/assets/side_menu_background.png and b/src/assets/side_menu_background.png differ diff --git a/src/assets/side_menu_background@2x.png b/src/assets/side_menu_background@2x.png index 80dee2be7..66d6097f9 100644 Binary files a/src/assets/side_menu_background@2x.png and b/src/assets/side_menu_background@2x.png differ diff --git a/src/assets/side_menu_background@3x.png b/src/assets/side_menu_background@3x.png index 63896bce2..8cc87f1f6 100644 Binary files a/src/assets/side_menu_background@3x.png and b/src/assets/side_menu_background@3x.png differ diff --git a/src/assets/steem_connect.png b/src/assets/steem_connect.png old mode 100755 new mode 100644 index e77a9b0a2..12f48df79 Binary files a/src/assets/steem_connect.png and b/src/assets/steem_connect.png differ diff --git a/src/assets/steem_connect@2x.png b/src/assets/steem_connect@2x.png index 131b582ac..77131ae73 100644 Binary files a/src/assets/steem_connect@2x.png and b/src/assets/steem_connect@2x.png differ diff --git a/src/assets/steem_connect@3x.png b/src/assets/steem_connect@3x.png index 13f5d16b0..f49dc99bd 100644 Binary files a/src/assets/steem_connect@3x.png and b/src/assets/steem_connect@3x.png differ diff --git a/src/components/postDropdown/container/postDropdownContainer.js b/src/components/postDropdown/container/postDropdownContainer.js index f3c2e7ae8..922d8a832 100644 --- a/src/components/postDropdown/container/postDropdownContainer.js +++ b/src/components/postDropdown/container/postDropdownContainer.js @@ -1,7 +1,7 @@ import React, { PureComponent, Fragment } from 'react'; import { connect } from 'react-redux'; import { withNavigation } from 'react-navigation'; -import { Share } from 'react-native'; +import { Share, Alert } from 'react-native'; import ActionSheet from 'react-native-actionsheet'; import { injectIntl } from 'react-intl'; import get from 'lodash/get'; @@ -154,7 +154,8 @@ class PostDropdownContainer extends PureComponent { ); }) .catch(error => { - if (String(get(error, 'jse_shortmsg', '')).indexOf('has already reblogged')) { + console.log(error); + if (String(get(error, 'jse_shortmsg', '')).indexOf('has already reblogged') > -1) { dispatch( toastNotification( intl.formatMessage({ @@ -163,7 +164,29 @@ class PostDropdownContainer extends PureComponent { ), ); } else { - dispatch(toastNotification(intl.formatMessage({ id: 'alert.fail' }))); + if (error && error.error_description.split(':')[1].includes('wait to transact')) { + //when RC is not enough, offer boosting account + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + intl.formatMessage({ + id: 'alert.rc_down', + }), + [ + { + text: 'Cancel', + onPress: () => console.log('Cancel Pressed'), + style: 'cancel', + }, + { text: 'OK', onPress: () => console.log('OK Pressed') }, + ], + { cancelable: false }, + ); + } else { + //when other errors + dispatch(toastNotification(intl.formatMessage({ id: 'alert.fail' }))); + } } }); } diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 64cea0880..5317e6260 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -167,7 +167,9 @@ const PostsView = ({ setIsLoading(false); return; } - setIsLoading(true); + if (posts.length > 2) { + setIsLoading(true); + } const filter = type || selectedFilterValue; let options; diff --git a/src/components/transaction/transactionView.js b/src/components/transaction/transactionView.js index e9505c612..88230f349 100644 --- a/src/components/transaction/transactionView.js +++ b/src/components/transaction/transactionView.js @@ -16,7 +16,7 @@ import globalStyles from '../../globalStyles'; const TransactionView = ({ transactions, type, refreshing, setRefreshing, isLoading }) => { const intl = useIntl(); - const transaction_types = ['ESTM', 'STEEM', 'SBD', 'SP']; + const transaction_types = ['ESTM', 'HIVE', 'HBD', 'HP']; const _renderLoading = () => { if (isLoading) { diff --git a/src/components/upvote/container/upvoteContainer.js b/src/components/upvote/container/upvoteContainer.js index 7ff489d32..85981600e 100644 --- a/src/components/upvote/container/upvoteContainer.js +++ b/src/components/upvote/container/upvoteContainer.js @@ -98,11 +98,11 @@ class UpvoteContainer extends PureComponent { const breakdownPayout = pending_payout_printed_sbd.toFixed(3) + - ' SBD, ' + + ' HBD, ' + pending_payout_printed_steem.toFixed(3) + - ' STEEM, ' + + ' HIVE, ' + pending_payout_sp.toFixed(3) + - ' SP'; + ' HP'; return ( { - Alert.alert('Failed!', err.message); - this.setState({ - isVoted: false, - isVoting: false, - }); + console.log(err); + if ( + err && + err.error_description.split(':')[1] && + err.error_description.split(':')[1].includes('wait to transact') + ) { + //when RC is not enough, offer boosting account + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + intl.formatMessage({ + id: 'alert.rc_down', + }), + [ + { + text: 'Cancel', + onPress: () => console.log('Cancel Pressed'), + style: 'cancel', + }, + { text: 'OK', onPress: () => console.log('OK Pressed') }, + ], + { cancelable: false }, + ); + this.setState({ + isVoted: false, + isVoting: false, + }); + } else { + //when voting with same percent or other errors + if (err.error_description.indexOf(':') > 0) { + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + err.error_description.split(':')[1], + ); + } else { + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + err.error_description, + ); + } + this.setState({ + isVoting: false, + }); + } }); } else { this.setState({ sliderValue: 1, downvote: false }); diff --git a/src/components/walletDetails/container/walletDetailsContainer.js b/src/components/walletDetails/container/walletDetailsContainer.js index 828255762..d70bc0474 100644 --- a/src/components/walletDetails/container/walletDetailsContainer.js +++ b/src/components/walletDetails/container/walletDetailsContainer.js @@ -31,16 +31,16 @@ class WalletContainer extends PureComponent { let balance; switch (fundType) { - case 'STEEM': + case 'HIVE': balance = Math.round(walletData.balance * 1000) / 1000; break; - case 'SBD': + case 'HBD': balance = Math.round(walletData.sbdBalance * 1000) / 1000; break; - case 'SAVING_STEEM': + case 'SAVING_HIVE': balance = Math.round(walletData.savingBalance * 1000) / 1000; break; - case 'SAVING_SBD': + case 'SAVING_HBD': balance = Math.round(walletData.savingBalanceSbd * 1000) / 1000; break; default: diff --git a/src/components/walletDetails/view/walletDetailsView.js b/src/components/walletDetails/view/walletDetailsView.js index 01de54e3b..c1638cf71 100644 --- a/src/components/walletDetails/view/walletDetailsView.js +++ b/src/components/walletDetails/view/walletDetailsView.js @@ -23,11 +23,11 @@ const WalletDetailsView = ({ walletData, intl, navigate, isShowDropdowns }) => { text="Steem" isBlackText iconName="ios-information-circle-outline" - rightText={`${Math.round(walletData.balance * 1000) / 1000} STEEM`} + rightText={`${Math.round(walletData.balance * 1000) / 1000} HIVE`} isBoldText isHasdropdown={isShowDropdowns} dropdownOptions={steemDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }))} - onDropdownSelect={index => navigate(steemDropdown[index], 'STEEM')} + onDropdownSelect={index => navigate(steemDropdown[index], 'HIVE')} /> { dropdownOptions={steemPowerDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }), )} - onDropdownSelect={a => navigate(steemPowerDropdown[a], 'STEEM_POWER')} + onDropdownSelect={a => navigate(steemPowerDropdown[a], 'HIVE_POWER')} /> {walletData.vestingSharesDelegated > 0 && ( @@ -84,7 +84,7 @@ const WalletDetailsView = ({ walletData, intl, navigate, isShowDropdowns }) => { isBoldText isHasdropdown={isShowDropdowns} dropdownOptions={sbdDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }))} - onDropdownSelect={a => navigate(sbdDropdown[a], 'SBD')} + onDropdownSelect={a => navigate(sbdDropdown[a], 'HBD')} /> { dropdownOptions={savingSteemDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }), )} - onDropdownSelect={a => navigate(savingSteemDropdown[a], 'SAVING_STEEM')} + onDropdownSelect={a => navigate(savingSteemDropdown[a], 'SAVING_HIVE')} /> { dropdownOptions={savingSbdDropdown.map(item => intl.formatMessage({ id: `transfer.${item}` }), )} - onDropdownSelect={a => navigate(savingSbdDropdown[a], 'SAVING_SBD')} + onDropdownSelect={a => navigate(savingSbdDropdown[a], 'SAVING_HBD')} /> {walletData.showPowerDown && ( diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2912fa7b4..aadbf57d4 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -64,12 +64,12 @@ "transfer_to_saving": "To Saving", "powerUp": "Power Up", "withdraw_to_saving": "Withdraw Saving", - "steemconnect_title": "Steemconnect Transfer", + "steemconnect_title": "Hivesigner Transfer", "next": "NEXT", "delegate": "Delegate", "power_down": "Power Down", - "withdraw_steem": "Withdraw Steem", - "withdraw_sbd": "Withdraw SBD", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HBD", "transfer_to_savings": "To Savings", "convert": "Convert", "escrow_transfer": "Escrow Transfer", @@ -86,21 +86,21 @@ "buy": "GET ESTM" }, "savingsteem": { - "title": "STEEM Savings" + "title": "HIVE Savings" }, "savingsbd": { - "title": "SBD Savings" + "title": "HBD Savings" }, "steem": { - "title": "STEEM", - "buy": "GET STEEM" + "title": "HIVE", + "buy": "GET HIVE" }, "sbd": { - "title": "SBD", - "buy": "GET SBD" + "title": "HBD", + "buy": "GET HBD" }, "steem_power": { - "title": "STEEM POWER" + "title": "HIVE POWER" }, "btc": { "title": "BTC", @@ -161,11 +161,11 @@ "follow_people": "Follow some people to fill your feed", "havent_commented": "haven't commented anything yet", "havent_posted": "haven't posted anything yet", - "steem_power": "Steem Power", + "steem_power": "Hive Power", "next_power_text": "Next power down is in", "days": "days", "day": "day", - "steem_dollars": "Steem Dollars", + "steem_dollars": "Hive Dollars", "savings": "Savings", "edit": { "display_name": "Display Name", @@ -213,14 +213,14 @@ "login": { "signin": "Sign in", "signup": "JOIN NOW", - "signin_title": "To get all the benefits of using eSteem", + "signin_title": "To get all the benefits of using Esteem", "username": "Username", "password": "Password or WIF", "description": "User credentials are kept locally on the device. Credentials are removed upon logout!", "cancel": "cancel", "login": "LOGIN", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Steemconnect.", - "steemconnect_fee_description": "Steemconnect may charge some fees from your reward transactions" + "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_fee_description": "info" }, "home": { "feed": "Feed", @@ -288,7 +288,7 @@ "success_shared": "Your post successfully shared", "success_moved": "Moved to draft", "permission_denied": "Permission denied", - "permission_text": "Please, go to phone Settings and change eSteem app permissions.", + "permission_text": "Please, go to phone Settings and change Esteem app permissions.", "key_warning": "Check private key permission!", "success_rebloged": "Reblogged!", "already_rebloged": "You have already reblogged!", @@ -319,7 +319,8 @@ "checking": "Checking...", "external_link": "Open in Browser", "not_existing_post": "The post does not exist! Please check permlink and author.", - "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!" + "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", + "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -415,17 +416,17 @@ "information": "Are you sure to transfer funds?", "amount_desc": "Balance", "memo_desc": "This memo is public", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF SBD price is higher than $1", + "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", "to_placeholder": "Username", "memo_placeholder": "Enter your notes here", "transfer_token": "Transfer", "purchase_estm": "Purchase ESTM", - "convert": "Convert SBD to STEEM", + "convert": "Convert HBD to HIVE", "points": "Gift ESTM to someone", "transfer_to_saving": "Transfer To Saving", "powerUp": "Power Up", "withdraw_to_saving": "Withdraw To Saving", - "steemconnect_title": "Steemconnect Transfer", + "steemconnect_title": "Hivesigner Transfer", "estimated_weekly": "Estimated Weekly", "destination_accounts": "Destination Accounts", "stop_information": "Are you sure want to stop?", @@ -436,14 +437,14 @@ "next": "NEXT", "delegate": "Delegate", "power_down": "Power Down", - "withdraw_steem": "Withdraw Steem", - "withdraw_sbd": "Withdraw Steem Dollar", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HIVE Dollar", "incoming_funds": "Incoming Funds", "stop": "Stop", "address_view": "View address" }, "boost": { - "title": "Get eSteem Points", + "title": "Get Esteem Points", "buy": "GET ESTM", "next": "NEXT" }, diff --git a/src/constants/options/api.js b/src/constants/options/api.js index e38bb5ee1..a1bab02b4 100644 --- a/src/constants/options/api.js +++ b/src/constants/options/api.js @@ -1,15 +1,3 @@ -export default [ - 'api.steemit.com', - 'rpc.esteem.app', - 'rpc.steemviz.com', - 'rpc.buildteam.io', - 'api.steem.house', -]; +export default ['rpc.esteem.app', 'api.hive.blog', 'anyx.io', 'api.hivekings.com']; -export const VALUE = [ - 'api.steemit.com', - 'rpc.esteem.app', - 'rpc.steemviz.com', - 'rpc.buildteam.io', - 'api.steem.house', -]; +export const VALUE = ['rpc.esteem.app', 'api.hive.blog', 'anyx.io', 'api.hivekings.com']; diff --git a/src/constants/steemConnectOptions.js b/src/constants/steemConnectOptions.js index 4a06ae128..d8c4b4415 100644 --- a/src/constants/steemConnectOptions.js +++ b/src/constants/steemConnectOptions.js @@ -1,5 +1,5 @@ export const steemConnectOptions = { - base_url: 'https://app.steemconnect.com/', + base_url: 'https://hivesigner.com/', client_id: 'esteemapp', redirect_uri: 'http://127.0.0.1:3415/', scope: diff --git a/src/containers/profileContainer.js b/src/containers/profileContainer.js index e0fa7a2a8..c6ba9523a 100644 --- a/src/containers/profileContainer.js +++ b/src/containers/profileContainer.js @@ -177,16 +177,50 @@ class ProfileContainer extends Component { _profileActionDone = (error = null) => { const { username } = this.state; + const { intl } = this.props; + this.setState({ isProfileLoading: false, }); + console.log(error); if (error) { - this.setState( - { - error, - }, - () => Alert.alert(get(error, 'message') || error.toString()), - ); + if ( + error.error_description && + error.error_description.split(':')[1].includes('wait to transact') + ) { + //when RC is not enough, offer boosting account + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + intl.formatMessage({ + id: 'alert.rc_down', + }), + [ + { + text: 'Cancel', + onPress: () => console.log('Cancel Pressed'), + style: 'cancel', + }, + { text: 'OK', onPress: () => console.log('OK Pressed') }, + ], + { cancelable: false }, + ); + } else { + //when other errors + this.setState( + { + error, + }, + () => + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + error.message || error.toString(), + ), + ); + } } else { this._fetchProfile(username, true); } diff --git a/src/containers/steemWalletContainer.js b/src/containers/steemWalletContainer.js index 1589629ae..a86b6b610 100644 --- a/src/containers/steemWalletContainer.js +++ b/src/containers/steemWalletContainer.js @@ -125,10 +125,10 @@ const WalletContainer = ({ const getBalance = (val, cur) => (val ? Math.round(val * 1000) / 1000 + cur : ''); setUnclaimedBalance( - `${getBalance(get(walletData, 'rewardSteemBalance', 0), ' STEEM')} ${getBalance( + `${getBalance(get(walletData, 'rewardSteemBalance', 0), ' HIVE')} ${getBalance( get(walletData, 'rewardSbdBalance', 0), - ' SBD', - )} ${getBalance(get(walletData, 'rewardVestingSteem', 0), ' SP')}`, + ' HBD', + )} ${getBalance(get(walletData, 'rewardVestingSteem', 0), ' HP')}`, ); } }, [userActivities, walletData]); @@ -149,10 +149,10 @@ const WalletContainer = ({ setEstimatedWalletValue && setEstimatedWalletValue(_walletData.estimatedValue); const getBalance = (val, cur) => (val ? Math.round(val * 1000) / 1000 + cur : ''); setUnclaimedBalance( - `${getBalance(get(_walletData, 'rewardSteemBalance', 0), ' STEEM')} ${getBalance( + `${getBalance(get(_walletData, 'rewardSteemBalance', 0), ' HIVE')} ${getBalance( get(_walletData, 'rewardSbdBalance', 0), - ' SBD', - )} ${getBalance(get(_walletData, 'rewardVestingSteem', 0), ' SP')}`, + ' HBD', + )} ${getBalance(get(_walletData, 'rewardVestingSteem', 0), ' HP')}`, ); }, [globalProps, setEstimatedWalletValue, steemPerMVests], @@ -244,7 +244,7 @@ const WalletContainer = ({ if ( (transferType === 'transfer_token' || transferType === 'purchase_estm') && - fundType === 'STEEM' + fundType === 'HIVE' ) { balance = Math.round(walletData.balance * 1000) / 1000; } @@ -252,14 +252,14 @@ const WalletContainer = ({ (transferType === 'transfer_token' || transferType === 'convert' || transferType === 'purchase_estm') && - fundType === 'SBD' + fundType === 'HBD' ) { balance = Math.round(walletData.sbdBalance * 1000) / 1000; } - if (transferType === 'withdraw_steem' && fundType === 'STEEM') { + if (transferType === 'withdraw_steem' && fundType === 'HIVE') { balance = Math.round(walletData.savingBalance * 1000) / 1000; } - if (transferType === 'withdraw_sbd' && fundType === 'SBD') { + if (transferType === 'withdraw_sbd' && fundType === 'HBD') { balance = Math.round(walletData.savingBalanceSbd * 1000) / 1000; } diff --git a/src/containers/transferContainer.js b/src/containers/transferContainer.js index 8bc6f7666..429db3771 100644 --- a/src/containers/transferContainer.js +++ b/src/containers/transferContainer.js @@ -74,7 +74,7 @@ class TransferContainer extends Component { if ( (transferType === 'purchase_estm' || transferType === 'transfer_token') && - fundType === 'STEEM' + fundType === 'HIVE' ) { balance = account[0].balance.replace(fundType, ''); } @@ -82,20 +82,20 @@ class TransferContainer extends Component { (transferType === 'purchase_estm' || transferType === 'convert' || transferType === 'transfer_token') && - fundType === 'SBD' + fundType === 'HBD' ) { balance = account[0].sbd_balance.replace(fundType, ''); } if (transferType === 'points' && fundType === 'ESTM') { this._getUserPointsBalance(username); } - if (transferType === 'transfer_to_saving' && fundType === 'STEEM') { + if (transferType === 'transfer_to_saving' && fundType === 'HIVE') { balance = account[0].balance.replace(fundType, ''); } - if (transferType === 'transfer_to_saving' && fundType === 'SBD') { + if (transferType === 'transfer_to_saving' && fundType === 'HBD') { balance = account[0].sbd_balance.replace(fundType, ''); } - if (transferType === 'powerUp' && fundType === 'STEEM') { + if (transferType === 'powerUp' && fundType === 'HIVE') { balance = account[0].balance.replace(fundType, ''); } if (transferType === 'address_view' && fundType === 'BTC') { diff --git a/src/providers/esteem/esteem.js b/src/providers/esteem/esteem.js index 611ff6a63..92503e2a2 100644 --- a/src/providers/esteem/esteem.js +++ b/src/providers/esteem/esteem.js @@ -352,14 +352,11 @@ export const getNodes = () => .get() .then( resp => - resp.data.nodes || [ + resp.data.hived || [ 'https://rpc.esteem.app', - 'https://api.steemit.com', - 'https://steemd.previx.io', + 'https://api.hive.blog', 'https://anyx.io', - 'https://rpc.buildteam.io', - 'https://rpc.steemviz.com', - 'https://api.steem.house', + 'https://api.hivekings.com', ], ); @@ -398,7 +395,7 @@ export const getCommunity = tag => } axios - .post('https://api.steemit.com', { + .post('https://rpc.esteem.app', { jsonrpc: '2.0', method: 'bridge.get_community', params: { name: tag, observer: '' }, diff --git a/src/providers/steem/auth.js b/src/providers/steem/auth.js index fb71de6bf..5c66717f7 100644 --- a/src/providers/steem/auth.js +++ b/src/providers/steem/auth.js @@ -1,4 +1,4 @@ -import * as dsteem from 'dsteem'; +import * as dsteem from '@hivechain/dsteem'; import sha256 from 'crypto-js/sha256'; import Config from 'react-native-config'; import get from 'lodash/get'; diff --git a/src/providers/steem/dsteem.js b/src/providers/steem/dsteem.js index f9edea1bb..ccff204ff 100644 --- a/src/providers/steem/dsteem.js +++ b/src/providers/steem/dsteem.js @@ -2,8 +2,8 @@ import '../../../shim'; import * as bitcoin from 'bitcoinjs-lib'; -import { Client, PrivateKey } from 'dsteem'; -import steemconnect from 'steemconnect'; +import { Client, PrivateKey } from '@hivechain/dsteem'; +import hivesigner from 'hivesigner'; import Config from 'react-native-config'; import { get, has } from 'lodash'; import { getServer } from '../../realm/realm'; @@ -23,7 +23,7 @@ import { getDsteemDateErrorMessage } from '../../utils/dsteemUtils'; // Constant import AUTH_TYPE from '../../constants/authType'; -const DEFAULT_SERVER = 'https://api.steemit.com'; +const DEFAULT_SERVER = 'https://anyx.io'; let client = new Client(DEFAULT_SERVER); export const checkClient = async () => { @@ -247,7 +247,7 @@ export const ignoreUser = async (currentAccount, pin, data) => { if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(currentAccount.local.accessToken, digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -393,7 +393,7 @@ export const deleteComment = (currentAccount, pin, permlink) => { if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(currentAccount.local.accessToken, digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -473,7 +473,7 @@ const _vote = async (currentAccount, pin, author, permlink, weight) => { if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(currentAccount.local.accessToken, digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -807,7 +807,7 @@ export const followUser = async (currentAccount, pin, data) => { if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -851,7 +851,7 @@ export const unfollowUser = async (currentAccount, pin, data) => { if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(currentAccount.local.accessToken, digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -963,7 +963,7 @@ const _postContent = async ( if (account.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(account.local.accessToken, digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -1068,7 +1068,7 @@ const _reblog = async (account, pinCode, author, permlink) => { if (account.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(account.local.accessToken, pin); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -1107,7 +1107,7 @@ export const claimRewardBalance = (account, pinCode, rewardSteem, rewardSbd, rew if (account.local.authType === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(get(account, 'local.accessToken'), pin); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); @@ -1232,7 +1232,7 @@ export const grantPostingPermission = async (json, pin, currentAccount) => { newPosting.account_auths.sort(); if (get(currentAccount, 'local.authType') === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); const _params = { @@ -1288,7 +1288,7 @@ export const profileUpdate = async (params, pin, currentAccount) => { if (get(currentAccount, 'local.authType') === AUTH_TYPE.STEEM_CONNECT) { const token = decryptKey(get(currentAccount, 'local.accessToken'), digitPinCode); - const api = new steemconnect.Client({ + const api = new hivesigner.Client({ accessToken: token, }); diff --git a/src/providers/steem/steemConnect.js b/src/providers/steem/steemConnect.js index d8dd165a6..62aba6a83 100644 --- a/src/providers/steem/steemConnect.js +++ b/src/providers/steem/steemConnect.js @@ -81,7 +81,7 @@ export const prepareBeneficiaries = postObj => { permlink: postObj.permlink, allow_votes: true, allow_curation_rewards: true, - max_accepted_payout: '1000000.000 SBD', + max_accepted_payout: '1000000.000 HBD', percent_steem_dollars: '10000', extensions: [ [ diff --git a/src/providers/steem/steemConnectAPI.js b/src/providers/steem/steemConnectAPI.js index 62e320e4d..53a6a7d25 100644 --- a/src/providers/steem/steemConnectAPI.js +++ b/src/providers/steem/steemConnectAPI.js @@ -1,7 +1,7 @@ -import steemconnect from 'steemconnect'; +import hivesigner from 'hivesigner'; -const api = new steemconnect.Client({ - app: 'esteem-app', +const api = new hivesigner.Client({ + app: 'esteemapp', callbackURL: 'http://127.0.0.1:3415', }); diff --git a/src/redux/reducers/applicationReducer.js b/src/redux/reducers/applicationReducer.js index b08c65e77..bad219f9b 100644 --- a/src/redux/reducers/applicationReducer.js +++ b/src/redux/reducers/applicationReducer.js @@ -28,7 +28,7 @@ import { } from '../constants/constants'; const initialState = { - api: 'api.steemit.com', + api: 'anyx.io', currency: { currency: 'usd', currencyRate: 1, diff --git a/src/screens/application/index.js b/src/screens/application/index.js index 85d20752b..0e36b9183 100644 --- a/src/screens/application/index.js +++ b/src/screens/application/index.js @@ -1,5 +1,5 @@ import React, { Fragment, useEffect, useState } from 'react'; - +import SplashScreen from 'react-native-splash-screen'; import ApplicationScreen from './screen/applicationScreen'; import ApplicationContainer from './container/applicationContainer'; @@ -11,6 +11,7 @@ const Application = () => { const [showAnimation, setShowAnimation] = useState(process.env.NODE_ENV !== 'development'); useEffect(() => { + SplashScreen.hide(); if (showAnimation) { setTimeout(() => { setShowAnimation(false); diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index 7ed43d339..2bced5a17 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -396,13 +396,36 @@ class EditorContainer extends Component { _handleSubmitFailure = error => { const { intl } = this.props; + console.log(error); + if (error && error.error_description.split(':')[1].includes('wait to transact')) { + //when RC is not enough, offer boosting account + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + intl.formatMessage({ + id: 'alert.rc_down', + }), + [ + { + text: 'Cancel', + onPress: () => console.log('Cancel Pressed'), + style: 'cancel', + }, + { text: 'OK', onPress: () => console.log('OK Pressed') }, + ], + { cancelable: false }, + ); + } else { + //when other errors + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + error.message || error.toString(), + ); + } - Alert.alert( - intl.formatMessage({ - id: 'alert.fail', - }), - error.message || error.toString(), - ); this.stateTimer = setTimeout(() => { this.setState({ isPostSending: false }); clearTimeout(this.stateTimer); diff --git a/src/screens/launch/screen/animation.json b/src/screens/launch/screen/animation.json index d55a960cf..f74855f53 100644 --- a/src/screens/launch/screen/animation.json +++ b/src/screens/launch/screen/animation.json @@ -1 +1 @@ -{"v":"5.5.9","fr":48,"ip":0,"op":170,"w":800,"h":800,"nm":"eSteem","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","parent":2,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[400.098,355.612,0],"ix":2},"a":{"a":0,"k":[0.576,-45.047,0],"ix":1},"s":{"a":0,"k":[41.152,41.152,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[81.5,312]],"o":[[0,0],[-11.368,-43.52]],"v":[[-136,16.5],[114.5,-157]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.285],"y":[1]},"o":{"x":[0.278],"y":[0]},"t":80,"s":[50]},{"t":115.80078125,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.285],"y":[1]},"o":{"x":[0.278],"y":[0]},"t":80,"s":[50]},{"t":115.80078125,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.627450920554,0.627450920554,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 2 - Group 1","parent":4,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[404.313,360.345,0],"ix":2},"a":{"a":0,"k":[404.313,360.345,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[45.066,73.536],[10.802,-12.769],[31.603,18.628]],"o":[[9.341,14.688],[-22.846,28.522],[55.94,62.733]],"v":[[45.406,-47.069],[39.248,-2.077],[-57.443,19.987]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.301960796118,0.631372570992,0.945098042488,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[404.313,360.345],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","parent":4,"td":1,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"t":28,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[392.019,344.214,0],"ix":2},"a":{"a":0,"k":[-19.057,-72.743,0],"ix":1},"s":{"a":0,"k":[41.152,41.152,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[30,97],[59.075,-58.216],[-78.099,-82.352],[106,254.5]],"o":[[83.25,35.5],[-14.272,-46.145],[-74.832,73.744],[101,106.5],[-61.167,-146.859]],"v":[[-107.5,-14.5],[85,-129],[-111.575,-130.284],[-119,121.5],[167,-108.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.031],"y":[1]},"o":{"x":[0.391],"y":[0]},"t":0,"s":[0]},{"t":145,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[1,0.627450920554,0.627450920554,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":72,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 2 - Group 2","tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.081],"y":[1]},"o":{"x":[0.449],"y":[0]},"t":4.801,"s":[0]},{"t":82,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.069,"y":1},"o":{"x":0.422,"y":0},"t":0,"s":[372,761,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.752,"y":0},"t":36,"s":[400,207,0],"to":[0,0,0],"ti":[0,0,0]},{"t":59,"s":[400,400,0]}],"ix":2},"a":{"a":0,"k":[399.861,374.15,0],"ix":1},"s":{"a":0,"k":[243,243,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[25.558,76.352],[1.849,1.603],[0,0],[-15.413,89.136],[-19.23,8.663],[-9.774,-12.813],[0.089,-2.341],[23.459,7.895],[-18.534,6.519],[-8.457,17.011],[30.771,-4.375],[-55.649,-43.161]],"o":[[-1.028,-3.074],[0,0],[10.483,125.658],[4.928,-20.22],[13.235,-5.967],[1.15,1.508],[-0.83,21.983],[10.634,21.97],[17.506,-6.157],[17.388,-34.973],[-69.704,9.91],[60.807,47.168]],"v":[[76.071,-25.556],[67.688,-43.192],[69.443,-32.244],[-59.082,-11.491],[-24.451,-54.715],[21.868,-50.477],[24.391,-42.916],[-56.052,-8.741],[0.222,6.005],[45.028,-29.955],[-12.731,-79.638],[-49.215,63.537]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.101960785687,0.313725501299,0.603921592236,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[399.861,374.15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":241.6,"st":0,"bm":0}],"markers":[]} \ No newline at end of file +{"v":"5.6.6","fr":30,"ip":0,"op":72,"w":1000,"h":1000,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"My Layers Null","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.67],"y":[1]},"o":{"x":[0.576],"y":[0]},"t":0,"s":[360]},{"t":44,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.491,"y":1},"o":{"x":0.709,"y":0},"t":0,"s":[500,672,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.8,"y":0},"t":25,"s":[500,330.477,0],"to":[0,0,0],"ti":[0,0,0]},{"t":44,"s":[500,489,0]}],"ix":2},"a":{"a":0,"k":[50,50,0],"ix":1},"s":{"a":0,"k":[162,162,100],"ix":6}},"ao":0,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 2","parent":3,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[58.497,3.229,0],"ix":2},"a":{"a":0,"k":[34.199,1.888,0],"ix":1},"s":{"a":0,"k":[171.045,171.045,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[55.77,59.487],[106,-100],[-218,31],[-14,105],[122,67],[122,-124],[-13.057,-43.296],[-186,-11],[-64,171]],"o":[[0,0],[0,0],[-75,-80],[-157.925,148.986],[174.879,-24.868],[14.018,-105.135],[-111.111,-61.02],[-146.317,148.716],[19,63],[248.904,14.72],[64,-171]],"v":[[-145,76.001],[186,-66],[184,-135],[-140,-152],[53,236],[329,-11],[180,-295],[-221,-243],[-319,109],[-35,343],[413,65]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.27658589681,0.647058823529,0.625266280829,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":94,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.6],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":0,"s":[0]},{"t":70,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":32,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"layer2","parent":1,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":360,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[40.925,40.925,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[189.938,-15.897],[67.198,19.965],[66.26,80.219],[0.072,112.429],[0,0.101],[-0.18,5.413],[-5.702,27.709],[-28.836,50.94],[-48.901,41.824],[-66.549,19.752],[-74.777,-13.227],[-55.686,-35.238],[-8.662,-130.781],[29.088,-61.944],[51.283,-37.858],[125.194,23.884],[43.668,66.386],[0,0],[0,0],[8.589,21.415],[0,0],[103.721,44.852],[111.227,-39.164],[51.86,-126.41],[-54.603,-119.856],[-121.296,-47.447],[-55.65,0],[-92.425,50.168],[-52.474,111.043],[31.362,122.007],[80.948,72.226],[114.547,22.054],[41.25,0],[115.594,-105.374],[24.721,-163.189],[-38.471,-104.201],[-313.652,69.736],[-92.064,190.765],[-12.631,37.374],[0,0]],"o":[[-160.417,193.832],[-69.869,5.843],[-98.957,-29.402],[-71.457,-86.596],[0,-0.098],[0,-5.417],[0.974,-28.269],[11.729,-57.386],[31.506,-55.599],[52.691,-45.115],[72.792,-21.614],[64.925,11.48],[108.557,68.718],[4.511,68.202],[-27.175,57.884],[-101.05,74.586],[-78.061,-14.894],[0,0],[0,0],[73.658,-36.999],[0,0],[-44.679,-91.281],[-113.465,-47.815],[-122.235,43.979],[-50.814,123.819],[49.911,112.729],[57.093,21.776],[105.778,0],[105.886,-57.454],[53.845,-113.948],[-27.248,-106.056],[-86.975,-77.643],[-40.528,-7.806],[-168.393,0],[-118.481,101],[-16.601,109.683],[113.248,306.9],[200.296,-44.538],[8.264,-17.07],[0,0],[0,0]],"v":[[623.388,205.532],[87.858,526.118],[-119.944,504.72],[-378.777,340.86],[-491.412,30.456],[-491.412,30.153],[-491.159,13.902],[-481.126,-70.259],[-419.341,-233.935],[-299.128,-383.55],[-117.634,-482.424],[107.671,-495.485],[290.789,-424.165],[488.27,-115.59],[451.278,84.323],[329.332,227.421],[-33.366,320.669],[-222.871,194.28],[381.987,-64.423],[382.384,-64.607],[425.222,-195.771],[425.006,-196.254],[201.432,-401.404],[-137.122,-414.447],[-399.492,-157.66],[-393.717,209.607],[-135.787,450.991],[34.122,483.807],[336.37,401.371],[592.677,150.11],[628.55,-222.52],[455.826,-490.924],[146.757,-644.213],[23.728,-655.906],[-413.891,-486.196],[-637.573,-77.679],[-605.418,249.417],[153.072,639.233],[606.463,274.344],[645.223,174.665],[623.389,205.532]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-68.498,27.843],[-39.626,0],[-27.68,-8.506],[-39.806,-48.695],[0,0],[-29.377,55.256]],"o":[[34.357,-64.6],[40.384,-16.421],[28.439,0],[58.068,17.843],[0,0],[-8.661,-65.322],[0,0]],"v":[[-247.809,-122.083],[-92.733,-261.399],[27.842,-286.138],[112.435,-273.323],[259.86,-173.077],[-278.629,57.245],[-247.809,-122.083]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.164705887437,0.298039227724,0.623529434204,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"path150","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":32,"op":300,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Shape Layer 1","parent":5,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[58.497,3.229,0],"ix":2},"a":{"a":0,"k":[34.199,1.888,0],"ix":1},"s":{"a":0,"k":[171.045,171.045,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[55.77,59.487],[106,-100],[-218,31],[-14,105],[122,67],[122,-124],[-13.057,-43.296],[-186,-11],[-64,171]],"o":[[0,0],[0,0],[-75,-80],[-157.925,148.986],[174.879,-24.868],[14.018,-105.135],[-111.111,-61.02],[-146.317,148.716],[19,63],[248.904,14.72],[64,-171]],"v":[[-145,76.001],[186,-66],[184,-135],[-140,-152],[53,236],[329,-11],[180,-295],[-221,-243],[-319,109],[-35,343],[413,65]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.27658589681,0.647058823529,0.625266280829,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":94,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.6],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":0,"s":[0]},{"t":70,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":32,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"layer1","parent":1,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":360,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[40.925,40.925,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"a","pt":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":28,"s":[{"i":[[0,0],[-102.968,-97.217],[-5.32,-153.618],[7.282,-40.584],[-82.491,-83.42],[0,0],[0,0]],"o":[[0,0],[82.313,77.715],[1.247,36.001],[-22.498,125.382],[150.149,151.84],[0,0],[0,0]],"v":[[-645.223,-655.906],[-428.68,-516.072],[-265.513,-172.133],[-274.158,-57.295],[-177.989,245.535],[645.223,655.906],[645.223,-655.906]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":29,"s":[{"i":[[0,0],[-111.669,-165.397],[-65.522,-12.453],[5.199,-28.976],[-82.491,-83.42],[0,0],[0,0]],"o":[[0,0],[49.706,73.621],[15.355,2.918],[-22.498,125.382],[150.149,151.84],[0,0],[0,0]],"v":[[-645.223,-655.906],[-622.277,-14.487],[-291.425,-102.344],[-274.158,-57.295],[-177.989,245.535],[645.223,655.906],[645.223,-655.906]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":30,"s":[{"i":[[0,0],[-111.669,-165.397],[-107.958,15.441],[-24.068,8.388],[-82.491,-83.42],[0,0],[0,0]],"o":[[0,0],[49.706,73.621],[25.3,-3.619],[9.305,60.749],[150.149,151.84],[0,0],[0,0]],"v":[[-645.223,-655.906],[-622.277,-14.487],[-353.094,71.882],[-278.621,53.861],[-177.989,245.535],[645.223,655.906],[645.223,-655.906]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31,"s":[{"i":[[0,0],[-85.324,-180.405],[-31.289,39.602],[-2.306,9.262],[-82.491,-83.42],[0,0],[0,0]],"o":[[0,0],[44.349,93.77],[7.333,-9.281],[9.305,60.749],[150.149,151.84],[0,0],[0,0]],"v":[[-645.223,-655.906],[-441.372,39.431],[-296.132,66.522],[-281.265,38.01],[-177.989,245.535],[645.223,655.906],[645.223,-655.906]],"c":true}]},{"t":32,"s":[{"i":[[0,0],[-177.687,-81.25],[38.385,121.748],[2.526,27.863],[-82.491,-83.42],[0,0],[0,0]],"o":[[0,0],[124.723,57.031],[-6.632,-21.036],[5.606,59.352],[150.149,151.84],[0,0],[0,0]],"v":[[-802.386,-427.101],[-396.615,234.783],[-267.6,105.598],[-280.356,38.125],[-177.989,245.535],[645.224,655.906],[645.224,-655.906]],"c":true}]}],"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"Mask 1"}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[189.938,-15.897],[67.198,19.965],[66.26,80.219],[0.072,112.429],[0,0.101],[-0.18,5.413],[-5.702,27.709],[-28.836,50.94],[-48.901,41.824],[-66.549,19.752],[-74.777,-13.227],[-55.686,-35.238],[-8.662,-130.781],[29.088,-61.944],[51.283,-37.858],[125.194,23.884],[43.668,66.386],[0,0],[0,0],[8.589,21.415],[0,0],[103.721,44.852],[111.227,-39.164],[51.86,-126.41],[-54.603,-119.856],[-121.296,-47.447],[-55.65,0],[-92.425,50.168],[-52.474,111.043],[31.362,122.007],[80.948,72.226],[114.547,22.054],[41.25,0],[115.594,-105.374],[24.721,-163.189],[-38.471,-104.201],[-313.652,69.736],[-92.064,190.765],[-12.631,37.374],[0,0]],"o":[[-160.417,193.832],[-69.869,5.843],[-98.957,-29.402],[-71.457,-86.596],[0,-0.098],[0,-5.417],[0.974,-28.269],[11.729,-57.386],[31.506,-55.599],[52.691,-45.115],[72.792,-21.614],[64.925,11.48],[108.557,68.718],[4.511,68.202],[-27.175,57.884],[-101.05,74.586],[-78.061,-14.894],[0,0],[0,0],[73.658,-36.999],[0,0],[-44.679,-91.281],[-113.465,-47.815],[-122.235,43.979],[-50.814,123.819],[49.911,112.729],[57.093,21.776],[105.778,0],[105.886,-57.454],[53.845,-113.948],[-27.248,-106.056],[-86.975,-77.643],[-40.528,-7.806],[-168.393,0],[-118.481,101],[-16.601,109.683],[113.248,306.9],[200.296,-44.538],[8.264,-17.07],[0,0],[0,0]],"v":[[623.388,205.532],[87.858,526.118],[-119.944,504.72],[-378.777,340.86],[-491.412,30.456],[-491.412,30.153],[-491.159,13.902],[-481.126,-70.259],[-419.341,-233.935],[-299.128,-383.55],[-117.634,-482.424],[107.671,-495.485],[290.789,-424.165],[488.27,-115.59],[451.278,84.323],[329.332,227.421],[-33.366,320.669],[-222.871,194.28],[381.987,-64.423],[382.384,-64.607],[425.222,-195.771],[425.006,-196.254],[201.432,-401.404],[-137.122,-414.447],[-399.492,-157.66],[-393.717,209.607],[-135.787,450.991],[34.122,483.807],[336.37,401.371],[592.677,150.11],[628.55,-222.52],[455.826,-490.924],[146.757,-644.213],[23.728,-655.906],[-413.891,-486.196],[-637.573,-77.679],[-605.418,249.417],[153.072,639.233],[606.463,274.344],[645.223,174.665],[623.389,205.532]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[-68.498,27.843],[-39.626,0],[-27.68,-8.506],[-39.806,-48.695],[0,0],[-29.377,55.256]],"o":[[34.357,-64.6],[40.384,-16.421],[28.439,0],[58.068,17.843],[0,0],[-8.661,-65.322],[0,0]],"v":[[-247.809,-122.083],[-92.733,-261.399],[27.842,-286.138],[112.435,-273.323],[259.86,-173.077],[-278.629,57.245],[-247.809,-122.083]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.164705887437,0.298039227724,0.623529434204,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"path150","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":32,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/src/screens/login/screen/loginScreen.js b/src/screens/login/screen/loginScreen.js index 04a939412..eea10260b 100644 --- a/src/screens/login/screen/loginScreen.js +++ b/src/screens/login/screen/loginScreen.js @@ -167,14 +167,7 @@ class LoginScreen extends PureComponent { /> - - + this._handleOnModalToggle()} source={STEEM_CONNECT_LOGO} - text="steem" - secondText="connect" + text="hive" + secondText="signer" /> diff --git a/src/screens/settings/container/settingsContainer.js b/src/screens/settings/container/settingsContainer.js index 938b59d70..ba58d4ccd 100644 --- a/src/screens/settings/container/settingsContainer.js +++ b/src/screens/settings/container/settingsContainer.js @@ -3,7 +3,7 @@ import { Platform } from 'react-native'; import { connect } from 'react-redux'; import AppCenter from 'appcenter'; import Push from 'appcenter-push'; -import { Client } from 'dsteem'; +import { Client } from '@hivechain/dsteem'; import VersionNumber from 'react-native-version-number'; import Config from 'react-native-config'; import { injectIntl } from 'react-intl'; @@ -77,13 +77,9 @@ class SettingsContainer extends Component { this.setState({ serverList: [ 'https://rpc.esteem.app', - 'https://api.steemit.com', - 'https://steemd.previx.io', + 'https://api.hive.blog', 'https://anyx.io', - 'https://rpc.buildteam.io', - 'https://rpc.steemviz.com', - 'https://api.steem.house', - 'https://steemd.pevo.science', + 'https://api.hivekings.com', ], }), ); diff --git a/src/screens/steem-connect/steemConnect.js b/src/screens/steem-connect/steemConnect.js index 24fb36be6..02807e36a 100644 --- a/src/screens/steem-connect/steemConnect.js +++ b/src/screens/steem-connect/steemConnect.js @@ -63,11 +63,12 @@ class SteemConnect extends PureComponent { } }) .catch(error => { + console.log(error); Alert.alert( 'Error', - intl.formatMessage({ - id: error.message, - }), + //intl.formatMessage({ id: + error, + //}), ); // TODO: return }); diff --git a/src/screens/transfer/screen/delegateScreen.js b/src/screens/transfer/screen/delegateScreen.js index d753edcee..76c2e7da1 100644 --- a/src/screens/transfer/screen/delegateScreen.js +++ b/src/screens/transfer/screen/delegateScreen.js @@ -194,7 +194,7 @@ class DelegateScreen extends Component { /> this._renderInformationText(`${spCalculated.toFixed(3)} SP`)} + rightComponent={() => this._renderInformationText(`${spCalculated.toFixed(3)} HP`)} /> ( - {`+ ${poweringDownFund} STEEM`} + {`+ ${poweringDownFund} HIVE`} {`- ${poweringDownVests} VESTS`} {nextPowerDown} @@ -280,7 +280,7 @@ class PowerDownView extends Component { {intl.formatMessage({ id: 'transfer.estimated_weekly' })} diff --git a/src/screens/wallet/screen/sbdView.js b/src/screens/wallet/screen/sbdView.js index ddce55e4d..9083e5b91 100644 --- a/src/screens/wallet/screen/sbdView.js +++ b/src/screens/wallet/screen/sbdView.js @@ -39,7 +39,7 @@ const SbdView = ({ handleOnSelected, index, currentIndex, refreshing: reload }) { balance: sbdBalance, nameKey: 'sbd', options: sbdDropdown }, { balance: sbdSavingBalance, nameKey: 'savingsbd', options: savingSbdDropdown }, ]} - handleOnDropdownSelected={option => navigate(option, 'SBD')} + handleOnDropdownSelected={option => navigate(option, 'HBD')} type="sbd" currentIndex={currentIndex} showIconList={false} diff --git a/src/screens/wallet/screen/spView.js b/src/screens/wallet/screen/spView.js index 6d5398e74..c09a74e86 100644 --- a/src/screens/wallet/screen/spView.js +++ b/src/screens/wallet/screen/spView.js @@ -41,7 +41,7 @@ const SpView = ({ handleOnSelected, index, currentIndex, refreshing: reload }) = userBalance={[ { balance: spBalance, nameKey: 'steem_power', options: steemPowerDropdown }, ]} - handleOnDropdownSelected={option => navigate(option, 'STEEM_POWER')} + handleOnDropdownSelected={option => navigate(option, 'HIVE_POWER')} type="steem_power" currentIndex={currentIndex} showIconList={false} @@ -51,7 +51,7 @@ const SpView = ({ handleOnSelected, index, currentIndex, refreshing: reload }) = value: ( {delegationsAmount} - {' SP'} + {' HP'} ), }, diff --git a/src/screens/wallet/screen/steemView.js b/src/screens/wallet/screen/steemView.js index bf0fcc31b..5ade6da72 100644 --- a/src/screens/wallet/screen/steemView.js +++ b/src/screens/wallet/screen/steemView.js @@ -43,7 +43,7 @@ const SteemView = ({ handleOnSelected, index, currentIndex, refreshing: reload } options: savingSteemDropdown, }, ]} - handleOnDropdownSelected={option => navigate(option, 'STEEM')} + handleOnDropdownSelected={option => navigate(option, 'HIVE')} type="steem" currentIndex={currentIndex} showIconList={false} diff --git a/src/utils/editor.js b/src/utils/editor.js index 4e64d59b9..925b81877 100644 --- a/src/utils/editor.js +++ b/src/utils/editor.js @@ -67,24 +67,24 @@ export const makeOptions = (author, permlink, operationType) => { allow_votes: true, author, permlink, - max_accepted_payout: '1000000.000 SBD', + max_accepted_payout: '1000000.000 HBD', percent_steem_dollars: 10000, extensions: [[0, { beneficiaries: [{ account: 'esteemapp', weight: 300 }] }]], }; switch (operationType) { case 'sp': - a.max_accepted_payout = '1000000.000 SBD'; + a.max_accepted_payout = '1000000.000 HBD'; a.percent_steem_dollars = 0; break; case 'dp': - a.max_accepted_payout = '0.000 SBD'; + a.max_accepted_payout = '0.000 HBD'; a.percent_steem_dollars = 10000; break; default: - a.max_accepted_payout = '1000000.000 SBD'; + a.max_accepted_payout = '1000000.000 HBD'; a.percent_steem_dollars = 10000; break; } diff --git a/src/utils/image.js b/src/utils/image.js index efc12bf87..907618737 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -1,5 +1,5 @@ import CryptoJS from 'crypto-js'; -import * as dsteem from 'dsteem'; +import * as dsteem from '@hivechain/dsteem'; import { Buffer } from 'buffer'; import { proxifyImageSrc } from '@esteemapp/esteem-render-helpers'; @@ -85,7 +85,7 @@ export const getResizedImage = (url, size = 640) => { return `${url.replace('img.esteem.app/', `img.esteem.app/${size}/`)}`; } */ - return `https://steemitimages.com/${size}x0/${url}`; + return `https://avatars.esteem.app/${size}x0/${url}`; }; export const getResizedAvatar = (author, sizeString = 'large') => { diff --git a/yarn.lock b/yarn.lock index 2b6b86523..1d62e7cd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1105,6 +1105,16 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@bam.tech/react-native-make@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@bam.tech/react-native-make/-/react-native-make-2.0.0.tgz#ca6135bc538ff338efc36552bb1a33b6cae4d0bf" + integrity sha512-mNwU/wtxJac2YU8rxtqErvp/1uAUX57BODjVP4C4M+33JnPurGoecfEbytRMkV7ZQKrgN/nS2kPpZMP1yytAbA== + dependencies: + color-string "^1.5.3" + colors "^1.3.3" + sharp "^0.23.0" + universal-analytics "^0.4.20" + "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" @@ -1228,6 +1238,19 @@ dependencies: "@hapi/hoek" "^8.3.0" +"@hivechain/dsteem@^0.12.12": + version "0.12.12" + resolved "https://registry.yarnpkg.com/@hivechain/dsteem/-/dsteem-0.12.12.tgz#38fee5a8a253c69d9bbf6d5f6d51144729784130" + integrity sha512-rYwZs8UrLEFLnUSPuMU7VhqUyEdyDz0Ul/VuV7yyheufk1v9BU3PgW1AKqqmhoU+Fh9HajD4WSZmvxYtjtBsjA== + dependencies: + bs58 "^4.0.1" + bytebuffer "^5.0.1" + core-js "^3.6.4" + cross-fetch "^3.0.4" + node-fetch "^2.6.0" + secp256k1 "^3.8.0" + whatwg-fetch "^3.0.0" + "@jest/console@^24.7.1", "@jest/console@^24.9.0": version "24.9.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0" @@ -1922,6 +1945,19 @@ appcenter@2.6.1, appcenter@^2.6.0: dependencies: appcenter-link-scripts "2.6.1" +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2405,6 +2441,15 @@ bitcoinjs-lib@5.1.1: varuint-bitcoin "^1.0.4" wif "^2.0.1" +bl@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" + integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.8, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -2577,6 +2622,14 @@ buffer@^5.4.3: base64-js "^1.0.2" ieee754 "^1.1.4" +buffer@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce" + integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + bugsnag-react-native@^2.23.4: version "2.23.4" resolved "https://registry.yarnpkg.com/bugsnag-react-native/-/bugsnag-react-native-2.23.4.tgz#4ea9e877a86488b0c6212b2ee756c597b7194878" @@ -2708,6 +2761,11 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== +chownr@^1.1.1, chownr@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -2811,7 +2869,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2823,16 +2881,42 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.5.2, color-string@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" + integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== +color@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10" + integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg== + dependencies: + color-convert "^1.9.1" + color-string "^1.5.2" + colorette@^1.0.7: version "1.1.0" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.1.0.tgz#1f943e5a357fac10b4e0f5aaef3b14cdc1af6ec7" integrity sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg== +colors@^1.3.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2940,6 +3024,11 @@ connect@^3.6.5: parseurl "~1.3.3" utils-merge "1.0.1" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" @@ -2967,11 +3056,16 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= -core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.6.0: +core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.6.0: version "2.6.11" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== +core-js@^3.6.4: + version "3.6.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647" + integrity sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -3027,7 +3121,7 @@ create-react-class@*, create-react-class@^15.6.2, create-react-class@^15.6.3: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-fetch@^3.0.1: +cross-fetch@^3.0.1, cross-fetch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c" integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw== @@ -3167,7 +3261,7 @@ debug@=3.1.0: dependencies: ms "2.0.0" -debug@^3.1.0: +debug@^3.0.0, debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -3184,6 +3278,13 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + dedent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb" @@ -3211,6 +3312,11 @@ deep-equal@^1.0.0: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3262,6 +3368,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + denodeify@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" @@ -3300,6 +3411,11 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -3415,18 +3531,6 @@ drbg.js@^1.0.1: create-hash "^1.1.2" create-hmac "^1.1.4" -dsteem@esteemapp/dsteem: - version "0.11.3" - resolved "https://codeload.github.com/esteemapp/dsteem/tar.gz/cf1ded7f96468361ada5195a710350867a306adb" - dependencies: - bs58 "^4.0.1" - bytebuffer "^5.0.1" - core-js "^2.5.0" - node-fetch "^2.3.0" - secp256k1 "^3.5.2" - verror "^1.10.0" - whatwg-fetch "^3.0.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3455,7 +3559,7 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -elliptic@^6.0.0, elliptic@^6.4.0, elliptic@^6.4.1: +elliptic@^6.0.0, elliptic@^6.4.0, elliptic@^6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== @@ -3490,7 +3594,7 @@ encoding@^0.1.11: dependencies: iconv-lite "~0.4.13" -end-of-stream@^1.1.0: +end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== @@ -4027,6 +4131,11 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + expect@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca" @@ -4366,6 +4475,11 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + fs-extra@^0.22.1: version "0.22.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056" @@ -4393,6 +4507,13 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -4416,6 +4537,20 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -4465,6 +4600,11 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -4545,7 +4685,7 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.1.0: +har-validator@~5.1.0, har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== @@ -4570,6 +4710,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -4634,6 +4779,15 @@ hermes-engine@^0.2.1: resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.2.1.tgz#25c0f1ff852512a92cb5c5cc47cf967e1e722ea2" integrity sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ== +hivesigner@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/hivesigner/-/hivesigner-3.1.3.tgz#941b75f984f92807f2377a77d64eef2acb209ad9" + integrity sha512-MOAPRTYrbpFwRdh7ebaBXVUdcmryfmnat3oS/sl5Q0BYsA4xVgtTzcFoo4CJ145CraoQ+mn1XY74fSssI0eadQ== + dependencies: + babel-runtime "^6.26.0" + cross-fetch "^3.0.1" + steem-uri "^0.1.1" + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -4800,7 +4954,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -4815,7 +4969,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4: +ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -4930,6 +5084,11 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -6509,6 +6668,11 @@ mimic-fn@^2.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -6536,11 +6700,31 @@ minimist@^1.1.1, minimist@^1.1.2, minimist@^1.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= +minipass@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" + integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== + dependencies: + yallist "^4.0.0" + +minizlib@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3" + integrity sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -6556,6 +6740,13 @@ mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "0.0.8" +mkdirp@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" + integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg== + dependencies: + minimist "^1.2.5" + moment@^2.22.0, moment@^2.22.2: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" @@ -6614,6 +6805,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -6634,7 +6830,14 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch@2.6.0, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.5.0: +node-abi@^2.7.0: + version "2.15.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.15.0.tgz#51d55cc711bd9e4a24a572ace13b9231945ccb10" + integrity sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg== + dependencies: + semver "^5.4.1" + +node-fetch@2.6.0, node-fetch@^2.2.0, node-fetch@^2.5.0, node-fetch@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== @@ -6668,6 +6871,11 @@ node-notifier@^5.2.1, node-notifier@^5.4.2: shellwords "^0.1.1" which "^1.3.0" +noop-logger@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" + integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + nopt@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" @@ -6716,6 +6924,16 @@ npm-which@^3.0.1: npm-path "^2.0.2" which "^1.2.10" +npmlog@^4.0.1, npmlog@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + nth-check@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -7300,6 +7518,27 @@ postcss@^7.0.5: source-map "^0.6.1" supports-color "^6.1.0" +prebuild-install@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.3.3.tgz#ef4052baac60d465f5ba6bf003c9c1de79b9da8e" + integrity sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.0" + mkdirp "^0.5.1" + napi-build-utils "^1.0.1" + node-abi "^2.7.0" + noop-logger "^0.1.1" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + which-pm-runs "^1.0.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -7518,6 +7757,16 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-addons-shallow-compare@15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.2.tgz#198a00b91fc37623db64a28fd17b596ba362702f" @@ -7772,6 +8021,11 @@ react-native-snap-carousel@^3.8.0: prop-types "^15.6.1" react-addons-shallow-compare "15.6.2" +react-native-splash-screen@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45" + integrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg== + react-native-svg@^9.5.3: version "9.13.6" resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-9.13.6.tgz#5365fba2bc460054b90851e71f2a71006a5d373f" @@ -8013,6 +8267,19 @@ readable-stream@^2.0.1, readable-stream@^2.2.2, readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^2.0.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + readable-stream@^3.1.1: version "3.4.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" @@ -8022,7 +8289,7 @@ readable-stream@^3.1.1: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^3.6.0: +readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -8227,6 +8494,32 @@ request@^2.87.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -8483,17 +8776,17 @@ scheduler@0.15.0, scheduler@^0.15.0: loose-envify "^1.1.0" object-assign "^4.1.1" -secp256k1@^3.5.2: - version "3.7.1" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.7.1.tgz#12e473e0e9a7c2f2d4d4818e722ad0e14cc1e2f1" - integrity sha512-1cf8sbnRreXrQFdH6qsg2H71Xw91fCCS9Yp021GnUNJzWJS/py96fS4lHbnTnouLp08Xj6jBoBB6V78Tdbdu5g== +secp256k1@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d" + integrity sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw== dependencies: bindings "^1.5.0" bip66 "^1.1.5" bn.js "^4.11.8" create-hash "^1.2.0" drbg.js "^1.0.1" - elliptic "^6.4.1" + elliptic "^6.5.2" nan "^2.14.0" safe-buffer "^5.1.2" @@ -8551,7 +8844,7 @@ serve-static@^1.13.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -8589,6 +8882,21 @@ shallow-equal@^1.2.1: resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA== +sharp@^0.23.0: + version "0.23.4" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.23.4.tgz#ca36067cb6ff7067fa6c77b01651cb9a890f8eb3" + integrity sha512-fJMagt6cT0UDy9XCsgyLi0eiwWWhQRxbwGmqQT6sY8Av4s0SVsT/deg8fobBQCTDU5iXRgz0rAeXoE2LBZ8g+Q== + dependencies: + color "^3.1.2" + detect-libc "^1.0.3" + nan "^2.14.0" + npmlog "^4.1.2" + prebuild-install "^5.3.3" + semver "^6.3.0" + simple-get "^3.1.0" + tar "^5.0.5" + tunnel-agent "^0.6.0" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -8631,6 +8939,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +simple-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" + integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + +simple-get@^3.0.3, simple-get@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + simple-plist@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.1.0.tgz#8354ab63eb3922a054c78ce96c209c532e907a23" @@ -8640,6 +8962,13 @@ simple-plist@^1.0.0: bplist-parser "0.2.0" plist "^3.0.1" +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + sisteransi@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" @@ -8927,7 +9256,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -9085,6 +9414,39 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +tar-fs@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" + integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== + dependencies: + chownr "^1.1.1" + mkdirp "^0.5.1" + pump "^3.0.0" + tar-stream "^2.0.0" + +tar-stream@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325" + integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q== + dependencies: + bl "^4.0.1" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tar@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/tar/-/tar-5.0.5.tgz#03fcdb7105bc8ea3ce6c86642b9c942495b04f93" + integrity sha512-MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ== + dependencies: + chownr "^1.1.3" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.0" + mkdirp "^0.5.0" + yallist "^4.0.0" + temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" @@ -9194,7 +9556,7 @@ toolkit.ts@^0.0.2: resolved "https://registry.yarnpkg.com/toolkit.ts/-/toolkit.ts-0.0.2.tgz#91bde730e5e6ad1a22146cdaf83f4a52721cf3b2" integrity sha512-yJJTVbCwiD6AfFgReewJCGJuODmyZUeL1sDjnxp33t0UBxnezgQrLbz/F9++RC28CTlk5u5pVji4TbeondYEkw== -tough-cookie@^2.3.3, tough-cookie@^2.3.4: +tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -9358,6 +9720,15 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" +universal-analytics@^0.4.20: + version "0.4.20" + resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03" + integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw== + dependencies: + debug "^3.0.0" + request "^2.88.0" + uuid "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -9433,6 +9804,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= +uuid@^3.0.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + uuid@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" @@ -9458,7 +9834,7 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -verror@1.10.0, verror@^1.10.0: +verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= @@ -9557,6 +9933,11 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + which@1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/which/-/which-1.2.11.tgz#c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b" @@ -9571,6 +9952,13 @@ which@^1.2.10, which@^1.2.9, which@^1.3.0: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + wif@^2.0.1, wif@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/wif/-/wif-2.0.6.tgz#08d3f52056c66679299726fade0d432ae74b4704" @@ -9744,6 +10132,11 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yargs-parser@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"