From bf52e501e83655939d58a3afac50986ccacc3cb4 Mon Sep 17 00:00:00 2001 From: Aaron Sutula Date: Wed, 3 Apr 2019 16:22:51 -0600 Subject: [PATCH] sdk 1.1.0 (#1011) * Update npm module and ios pod install * Code changs for new sdk * Updated to latest rn sdk with fixes --- App/Components/GroupCard/index.tsx | 2 +- App/Containers/Account.tsx | 2 +- App/Containers/AddContact.tsx | 6 +- App/Containers/Contacts.tsx | 12 +- App/Containers/OnboardingUsername.tsx | 2 +- App/Redux/AccountSelectors.ts | 2 +- App/Redux/ThreadsRedux.ts | 4 +- App/Redux/__tests__/AccountRedux.ts | 17 +- App/Redux/__tests__/ThreadsRedux.ts | 2 +- .../ContactSelect/ContactSelectCard.js | 2 +- App/SB/components/ContactSelect/index.js | 8 +- App/SB/views/ThreadsEditFriends/index.tsx | 24 +- App/Sagas/Account/AccountSagas.ts | 4 +- App/Sagas/ThreadsSagas.ts | 4 +- App/Services/DeepLink.ts | 2 +- App/Services/__tests__/DeepLink.ts | 2 +- App/features/contacts/reducer.ts | 6 +- App/features/contacts/sagas.ts | 4 +- App/features/contacts/selectors.ts | 18 +- android/build.gradle | 2 +- ios/Podfile.lock | 16 +- .../textile-react-native-sdk.podspec.json | 6 +- ios/Pods/Manifest.lock | 16 +- ios/Pods/Textile/Textile/Classes/AccountApi.h | 4 +- ios/Pods/Textile/Textile/Classes/AccountApi.m | 10 +- .../Textile/Textile/Classes/ContactsApi.h | 6 +- .../Textile/Textile/Classes/ContactsApi.m | 12 +- ios/Pods/Textile/Textile/Classes/InvitesApi.h | 4 +- ios/Pods/Textile/Textile/Classes/InvitesApi.m | 8 +- .../Textile/Classes/LifecycleManager.m | 6 + ios/Pods/Textile/Textile/Classes/Messenger.m | 8 +- ios/Pods/Textile/Textile/Classes/ProfileApi.h | 6 +- ios/Pods/Textile/Textile/Classes/ProfileApi.m | 12 +- ios/Pods/Textile/Textile/Classes/TextileApi.m | 2 +- .../Textile/Textile/Classes/TextileDelegate.h | 8 +- ios/Pods/Textile/Textile/Classes/ThreadsApi.h | 3 + ios/Pods/Textile/Textile/Classes/ThreadsApi.m | 8 + .../Versions/A/Headers/Mobile.objc.h | 32 +- .../Mobile.framework/Versions/A/Mobile | 4 +- .../TextileCore/protos/CafeService.pbobjc.h | 104 +++++- .../TextileCore/protos/CafeService.pbobjc.m | 309 ++++++++++++++++-- ios/Pods/TextileCore/protos/Message.pbobjc.h | 11 +- ios/Pods/TextileCore/protos/Message.pbobjc.m | 44 ++- ios/Pods/TextileCore/protos/Model.pbobjc.h | 85 +++-- ios/Pods/TextileCore/protos/Model.pbobjc.m | 220 ++++++++++--- ios/Pods/TextileCore/protos/Query.pbobjc.h | 33 +- ios/Pods/TextileCore/protos/Query.pbobjc.m | 88 +++-- .../protos/ThreadsService.pbobjc.h | 20 +- .../protos/ThreadsService.pbobjc.m | 28 +- ios/Pods/TextileCore/protos/View.pbobjc.h | 70 ++-- ios/Pods/TextileCore/protos/View.pbobjc.m | 248 +++++++++----- package.json | 2 +- yarn.lock | 17 +- 53 files changed, 1116 insertions(+), 459 deletions(-) diff --git a/App/Components/GroupCard/index.tsx b/App/Components/GroupCard/index.tsx index e6eb7f459..733c576bb 100644 --- a/App/Components/GroupCard/index.tsx +++ b/App/Components/GroupCard/index.tsx @@ -65,7 +65,7 @@ const GroupCard = (props: ScreenProps) => { { members.slice(0, 8).map((mem: pb.IContact, i: number) => { const imageStyle = cardImageStyle(members.length, i) - return () + return () })} diff --git a/App/Containers/Account.tsx b/App/Containers/Account.tsx index 657e40654..8baf2c063 100644 --- a/App/Containers/Account.tsx +++ b/App/Containers/Account.tsx @@ -40,7 +40,7 @@ class Account extends Component { } const mapStateToProps = (state: RootState): StateProps => ({ - username: state.account.profile.value ? state.account.profile.value.username || state.account.profile.value.id : 'unknown' + username: state.account.profile.value ? state.account.profile.value.name || state.account.profile.value.address : 'unknown' }) export default connect(mapStateToProps, undefined)(Account) diff --git a/App/Containers/AddContact.tsx b/App/Containers/AddContact.tsx index 662c1df6f..0e513001c 100644 --- a/App/Containers/AddContact.tsx +++ b/App/Containers/AddContact.tsx @@ -132,8 +132,8 @@ class AddContact extends React.Component { return ( } - title={item.data.contact.username || item.data.contact.id} - subtitle={item.data.contact.id.substr(item.data.contact.id.length - 8, 8)} + title={item.data.contact.name || item.data.contact.address} + subtitle={item.data.contact.address.substr(item.data.contact.address.length - 8, 8)} rightItems={[