Skip to content

Commit

Permalink
Merge pull request #126 from Bitcoin-com/develop
Browse files Browse the repository at this point in the history
0.9.0 - Open from URI's
  • Loading branch information
SpicyPete authored Jul 15, 2019
2 parents 2fe46a8 + a23a3c2 commit a7b3a0a
Show file tree
Hide file tree
Showing 54 changed files with 987 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.94.0
^0.101.0
6 changes: 5 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"singleQuote": false
"singleQuote": false,
"printWidth": 80,
"arrowParens": "avoid",
"trailingComma": "none",
"bracketSpacing": true
}
5 changes: 4 additions & 1 deletion App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ const AppWrapper = styled(View)`
flex: 1;
`;

const prefix = "bitcoincash:";
const slpPrefix = "simpleledger:";

const App = () => {
return (
<Provider store={store}>
<PersistGate loading={null} persistor={persistor}>
<ThemeProvider theme={spaceBadger}>
<AppWrapper>
<AppNavigator />
<AppNavigator uriPrefix={prefix || slpPrefix} />
</AppWrapper>
</ThemeProvider>
</PersistGate>
Expand Down
14 changes: 11 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# Badger Wallet changelog
# Badger Wallet - Changelog

## 0.9.0

- Request amount of any token from the detail screen
- Scan and parse URI's and QR codes for SLP tokens
- Open Badger Wallet directly from any valid URI
- Adding in more token icons
- Icon is now centered correctly

## 0.8.0

Expand All @@ -14,13 +22,13 @@

- Currency select screen from Menu
- Change to any base currency to display your BCH balance as.
- At first enabling a whistelist of 24 top used currencies
- At first enabling a whitelist of 24 top used currencies
- Number formatting improvements throughout to better match selected currency
- Improved fee calculations when sending SLP

### Bug fixes

- Updating bitbox to reduce server load
- Updating bitbox-sdk to reduce server load
- Fixed SLP issue sending tokens when user has a large number of SLP related UTXO
- Fixed bug where new users see negative balance in sending flow
- Allow sending non fungible tokens without ticker symbols
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ android {
applicationId "com.badgermobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 7
versionName "1.5"
versionCode 8
versionName "1.6"
missingDimensionStrategy 'react-native-camera', 'general'
}
signingConfigs {
Expand Down
12 changes: 12 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="bitcoincash" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="simpleledger" />
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
Expand Down
Binary file modified android/app/src/main/ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/icon-1024.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion atoms/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import T from "../T";

const StyledButton = styled(TouchableOpacity)`
border-width: ${StyleSheet.hairlineWidth};
min-width: 150px;
min-width: 135px;
padding: 8px 12px;
border-radius: 3px;
Expand Down
56 changes: 28 additions & 28 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ PODS:
- DoubleConversion
- glog
- glog (0.3.5)
- React (0.59.8):
- React/Core (= 0.59.8)
- React (0.59.9):
- React/Core (= 0.59.9)
- react-native-camera (2.6.0):
- React
- react-native-camera/RCT (= 2.6.0)
Expand All @@ -18,70 +18,70 @@ PODS:
- React
- react-native-randombytes (3.5.2):
- React
- React/Core (0.59.8):
- yoga (= 0.59.8.React)
- React/CxxBridge (0.59.8):
- React/Core (0.59.9):
- yoga (= 0.59.9.React)
- React/CxxBridge (0.59.9):
- Folly (= 2018.10.22.00)
- React/Core
- React/cxxreact
- React/jsiexecutor
- React/cxxreact (0.59.8):
- React/cxxreact (0.59.9):
- boost-for-react-native (= 1.63.0)
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsinspector
- React/DevSupport (0.59.8):
- React/DevSupport (0.59.9):
- React/Core
- React/RCTWebSocket
- React/fishhook (0.59.8)
- React/jsi (0.59.8):
- React/fishhook (0.59.9)
- React/jsi (0.59.9):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/jsiexecutor (0.59.8):
- React/jsiexecutor (0.59.9):
- DoubleConversion
- Folly (= 2018.10.22.00)
- glog
- React/cxxreact
- React/jsi
- React/jsinspector (0.59.8)
- React/RCTActionSheet (0.59.8):
- React/jsinspector (0.59.9)
- React/RCTActionSheet (0.59.9):
- React/Core
- React/RCTAnimation (0.59.8):
- React/RCTAnimation (0.59.9):
- React/Core
- React/RCTBlob (0.59.8):
- React/RCTBlob (0.59.9):
- React/Core
- React/RCTGeolocation (0.59.8):
- React/RCTGeolocation (0.59.9):
- React/Core
- React/RCTImage (0.59.8):
- React/RCTImage (0.59.9):
- React/Core
- React/RCTNetwork
- React/RCTLinkingIOS (0.59.8):
- React/RCTLinkingIOS (0.59.9):
- React/Core
- React/RCTNetwork (0.59.8):
- React/RCTNetwork (0.59.9):
- React/Core
- React/RCTSettings (0.59.8):
- React/RCTSettings (0.59.9):
- React/Core
- React/RCTText (0.59.8):
- React/RCTText (0.59.9):
- React/Core
- React/RCTVibration (0.59.8):
- React/RCTVibration (0.59.9):
- React/Core
- React/RCTWebSocket (0.59.8):
- React/RCTWebSocket (0.59.9):
- React/Core
- React/fishhook
- React/RCTBlob
- ReactNativePermissions (1.1.1):
- React
- RNCAsyncStorage (1.4.0):
- RNCAsyncStorage (1.4.1):
- React
- RNGestureHandler (1.1.0):
- React
- RNSVG (9.4.0):
- React
- RNVectorIcons (6.4.2):
- React
- yoga (0.59.8.React)
- yoga (0.59.9.React)

DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
Expand Down Expand Up @@ -145,16 +145,16 @@ SPEC CHECKSUMS:
DoubleConversion: bb338842f62ab1d708ceb63ec3d999f0f3d98ecd
Folly: de497beb10f102453a1afa9edbf8cf8a251890de
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
React: 76e6aa2b87d05eb6cccb6926d72685c9a07df152
React: a86b92f00edbe1873a63e4a212c29b7a7ad5224f
react-native-camera: 60e1ec7b259a7779b508712f75671701f23a6b4d
react-native-randombytes: aa2b5e8bf90a9c0402101c62ed7b145f02940e32
ReactNativePermissions: b64e084dff6a5cad51587d38c306f09246246384
RNCAsyncStorage: 0c3ef98facf3fecf455b518d6f52e10fc964c523
RNCAsyncStorage: ee70d057f2576e8060891c98d8babddd46462682
RNGestureHandler: b65d391f4f570178d657b99a16ec99d09b8656b0
RNSVG: 9cb6e958c4b6a1f58185ac72a350b148947d6fed
RNVectorIcons: 6607bd3a30291d0edb56f9bbe7ae411ee2b928b0
yoga: 92b2102c3d373d1a790db4ab761d2b0ffc634f64
yoga: 03ff42a6f223fb88deeaed60249020d80c3091ee

PODFILE CHECKSUM: c7126102c1114b904c4d5f7101b5dd8ea34d7ea0
PODFILE CHECKSUM: f2d0eb56d3d1a3aadeb3a9d912ecadac18308043

COCOAPODS: 1.6.1
8 changes: 8 additions & 0 deletions ios/badgerMobile/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#import <React/RCTBridge.h>
#import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
#import <React/RCTLinkingManager.h>

@implementation AppDelegate

Expand Down Expand Up @@ -39,4 +40,11 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
#endif
}

- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url
sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
{
return [RCTLinkingManager application:application openURL:url
sourceApplication:sourceApplication annotation:annotation];
}

@end
Binary file modified ios/badgerMobile/Images.xcassets/AppIcon.appiconset/Icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 24 additions & 1 deletion ios/badgerMobile/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,32 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.0</string>
<string>0.9.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>Badger Wallet</string>
<key>CFBundleURLSchemes</key>
<array>
<string>bitcoincash</string>
</array>
</dict>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>Badger Wallet</string>
<key>CFBundleURLSchemes</key>
<array>
<string>simpleledger</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
6 changes: 3 additions & 3 deletions navigation/AppNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import AuthStack from "./AuthStack";
export default createAppContainer(
createSwitchNavigator(
{
AuthStack,
AuthStack: { screen: AuthStack, path: "" },
// SendStack: { screen: SendStack },
AuthLoadingCheck: AuthLoadingScreen,
Main: MainAppStack
AuthLoadingCheck: { screen: AuthLoadingScreen, path: ":address" },
Main: { screen: MainAppStack, path: "" }
},
{
initialRouteName: "AuthLoadingCheck"
Expand Down
Loading

0 comments on commit a7b3a0a

Please sign in to comment.